Changeset 15430

Timestamp:

2009-04-27T03:38:15+02:00 (9 years ago)

Author:

jow

Message:

[package] unvram: get rid of some memory leaks

Location:

trunk/package/unvram

Files:

• Makefile (modified) (1 diff)
• src/nvram.c (modified) (11 diffs)
• src/nvram.h (modified) (2 diffs)

trunk/package/unvram/Makefile

@@ -9 +9 @@
 
 PKG_NAME:=unvram
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

trunk/package/unvram/src/nvram.c

@@ -339 +339 @@
 {
         int fd;
+        char *mtd = NULL;
         nvram_handle_t *h;
         nvram_header_t *header;
@@ -346 +347 @@
         {
                 /* Finding the mtd will set the appropriate erase size */
-                if( file == NULL )
-                        file = nvram_find_mtd();
-                else
-                        (void) nvram_find_mtd();
-
-                if( nvram_erase_size == 0 )
+                if( (mtd = nvram_find_mtd()) == NULL || nvram_erase_size == 0 )
+                {
+                        free(mtd);
                         return NULL;
-        }
-
-        if( (fd = open(file, O_RDWR)) > -1 )
+                }
+        }
+
+        if( (fd = open(file ? file : mtd, O_RDWR)) > -1 )
         {
                 char *mmap_area = (char *) mmap(
@@ -378 +377 @@
                                 {
                                         _nvram_rehash(h);
+                                        free(mtd);
                                         return h;
                                 }
@@ -389 +389 @@
         }
 
+        free(mtd);
         return NULL;
 }
@@ -404 +405 @@
 
 /* Determine NVRAM device node. */
-const char * nvram_find_mtd(void)
+char * nvram_find_mtd(void)
 {
         FILE *fp;
@@ -412 +413 @@
         struct stat s;
 
-        // "/dev/mtdblock/" + ( 0 < x < 99 ) + \0 = 19
-        if( (path = (char *) malloc(19)) == NULL )
-                return NULL;
-
-        if ((fp = fopen("/proc/mtd", "r"))) {
-                while (fgets(dev, sizeof(dev), fp)) {
-                        if (strstr(dev, "nvram") && sscanf(dev, "mtd%d: %08x", &i, &esz))
+        if( (fp = fopen("/proc/mtd", "r")) )
+        {
+                while( fgets(dev, sizeof(dev), fp) )
+                {
+                        if( strstr(dev, "nvram") && sscanf(dev, "mtd%d: %08x", &i, &esz) )
                         {
                                 nvram_erase_size = esz;
@@ -452 +451 @@
 
 /* Check NVRAM staging file. */
-const char * nvram_find_staging(void)
+char * nvram_find_staging(void)
 {
         struct stat s;
@@ -468 +467 @@
 {
         int fdmtd, fdstg, stat;
-        const char *mtd = nvram_find_mtd();
+        char *mtd = nvram_find_mtd();
         char buf[nvram_erase_size];
 
@@ -493 +492 @@
         }
 
+        free(mtd);
         return stat;
 }
@@ -500 +500 @@
 {
         int fdmtd, fdstg, stat;
-        const char *mtd = nvram_find_mtd();
+        char *mtd = nvram_find_mtd();
         char buf[nvram_erase_size];
 
@@ -527 +527 @@
         }
 
+        free(mtd);
         return stat;
 }

trunk/package/unvram/src/nvram.h

@@ -91 +91 @@
 
 /* Determine NVRAM device node. */
-const char * nvram_find_mtd(void);
+char * nvram_find_mtd(void);
 
 /* Copy NVRAM contents to staging file. */
@@ -100 +100 @@
 
 /* Check NVRAM staging file. */
-const char * nvram_find_staging(void);
+char * nvram_find_staging(void);