Changeset 157 in libcf

Timestamp:

11/26/13 09:06:48 (10 years ago)

Author:

cheese

Message:

#1 fix memory leakage

Location:

trunk

Files:

• src/cf_file.c (modified) (3 diffs)
• src/cf_log.c (modified) (1 diff)
• test/log.c (modified) (2 diffs)

trunk/src/cf_file.c

@@ -234 +234 @@
 CF_File_GetSize (const char * path)
 {
-    int length = 0;
     int result = 0;
 
@@ -241 +240 @@
     ASSERT_ARGS (path == NULL);
 
-    result = CF_File_Open ((cf_ctx *)&context, path, CF_FILE_READ);
-    if (result < 0)
-        return CF_ERROR_FILE_OPEN;
-
-    length = (int) lseek (context->fd, 0, SEEK_END);
-    if (length < 0)
-        return CF_ERROR_FILE_GET_SIZE;
+    TRY
+    {
+        result = CF_File_Open ((cf_ctx *)&context, path, CF_FILE_READ);
+        if (result < 0)
+        {
+            result = CF_ERROR_FILE_OPEN;
+            TRY_BREAK;
+        }
+
+        result = (int) lseek (context->fd, 0, SEEK_END);
+        if (result < 0)
+        {
+            result = CF_ERROR_FILE_GET_SIZE;
+            TRY_BREAK;
+        }
+    }
+    NO_CATCH;
 
     CF_File_Close ((cf_ctx)context);
 
-    return length;
+    return result;
 }
 
@@ -287 +296 @@
     ASSERT_ARGS (path == NULL);
 
-    length = strlen (path);
-    fullpath = (char *) calloc (length + 2, 1);
-    if (!fullpath)
-        return CF_ERROR_FILE_ALLOCATE_BUFFER;
-
-    f = fullpath;
-    d = stepPath;
-
-    snprintf (fullpath, length + 1, "%s%c", path, DELIMITER);
-
-    for (*d++ = *f++ ; *f ; *d++ = *f++)
+    TRY
     {
-        if (*f != DELIMITER)
-            continue;
-
-        if (CF_File_Exists (stepPath))
-            continue;
+        length = strlen (path);
+        fullpath = (char *) calloc (length + 2, 1);
+        if (!fullpath)
+        {
+            result = CF_ERROR_FILE_ALLOCATE_BUFFER;
+            TRY_BREAK;
+        }
+
+        f = fullpath;
+        d = stepPath;
+
+        snprintf (fullpath, length + 1, "%s%c", path, DELIMITER);
+
+        for (*d++ = *f++ ; *f ; *d++ = *f++)
+        {
+            if (*f != DELIMITER)
+                continue;
+
+            if (CF_File_Exists (stepPath))
+                continue;
 
 #define DIRECTORY_MODE  (S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
-        result = mkdir (stepPath, DIRECTORY_MODE);
-        if (result && errno != EEXIST)
-            return CF_ERROR_FILE_MAKE_DIRECTORY;
+            result = mkdir (stepPath, DIRECTORY_MODE);
+            if (result && errno != EEXIST)
+            {
+                result = CF_ERROR_FILE_MAKE_DIRECTORY;
+                break;
+            }
+        }
     }
-
-    return CF_OK;
+    NO_CATCH;
+
+    if (fullpath)   free (fullpath);
+
+    return result;
 }
 

trunk/src/cf_log.c

@@ -45 +45 @@
 typedef struct __cf_log_ctx__
 {
-    cf_ctx          file;
-    char            * buffer;
-    size_t          size;   /* entire size of buffer */
-    size_t          length; /* data length in current */
+    cf_ctx  file;
+    char    * buffer;
+    size_t  size;   /* entire size of buffer */
+    size_t  length; /* data length in current */
     cf_ctx  mutex;
 } CF_LOG_CONTEXT;

trunk/test/log.c

@@ -47 +47 @@
 
     /* initialize */
+    /* single thread {{{ */
     if (CF_Log_Create (&globalLog, "log.txt", CF_LOG_NO_BUFFER) < 0)
         CF_DEBUG_PRINT (stderr, "failed to open log\n");
@@ -56 +57 @@
             CF_DEBUG_PRINT (stderr, "failed to write log %d\n", result);
     }
+
+    CF_Log_Destroy (globalLog);
+    /* }}} single thread */
 
     /* mt {{{ */