Changeset 1546:c48725959e63 in freeDiameter

Timestamp:

Jun 16, 2020, 3:33:03 AM (4 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

rt_ereg: improve memory handling

File:

• extensions/rt_ereg/rtereg.c (modified) (3 diffs)

extensions/rt_ereg/rtereg.c

@@ -191 +191 @@
                                         /* Augment the buffer if needed */
                                         if (avp_hdr->avp_value->os.len >= bufsz) {
-                                                CHECK_MALLOC_DO( buf = realloc(buf, avp_hdr->avp_value->os.len + 1),
+                                                char *newbuf;
+                                                CHECK_MALLOC_DO( newbuf = realloc(buf, avp_hdr->avp_value->os.len + 1),
                                                         { pthread_mutex_unlock(&mtx); return ENOMEM; } );
+                                                /* Update buffer and buffer size */
+                                                buf = newbuf;
+                                                bufsz = avp_hdr->avp_value->os.len + 1;
                                         }
 
@@ -320 +324 @@
 {
         /* Initialize the configuration */
-        if ((rtereg_conf=malloc(sizeof(*rtereg_conf))) == NULL) {
+        if ((rtereg_conf=calloc(sizeof(*rtereg_conf), 1)) == NULL) {
                 LOG_E("[rt_ereg] malloc failured");
                 return 1;
         }
         rtereg_conf_size = 1;
-        memset(rtereg_conf, 0, sizeof(*rtereg_conf));
 
         /* Parse the configuration file */
@@ -372 +375 @@
         free(buf);
         buf = NULL;
+        bufsz = 0;
 #endif /* HAVE_REG_STARTEND */