Changeset a12f7f1 in mainline

Timestamp:

2011-07-21T02:24:41Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cfbb5d18

Parents:

94f8b81c

Message:

All occurences of call to native free() secured from passing NULL pointer.

Location:

uspace/lib/posix

Files:

• fnmatch.c (modified) (1 diff)
• locale.c (modified) (1 diff)
• stdio/scanf.c (modified) (3 diffs)
• time.c (modified) (1 diff)

uspace/lib/posix/fnmatch.c

@@ -553 +553 @@
 
         if ((flags & FNM_CASEFOLD) != 0) {
-                free((char *) pattern);
-                free((char *) string);
+                if (pattern) {
+                        free((char *) pattern);
+                }
+                if (string) {
+                        free((char *) string);
+                }
         }
 

uspace/lib/posix/locale.c

@@ -127 +127 @@
 void posix_freelocale(posix_locale_t locobj)
 {
-        free(locobj);
+        if (locobj) {
+                free(locobj);
+        }
 }
 

uspace/lib/posix/stdio/scanf.c

@@ -303 +303 @@
         self->fetched = 0;
         self->cursor = NULL;
-        free(self->window);
-        self->window = NULL;
+        if (self->window) {
+                free(self->window);
+                self->window = NULL;
+        }
         self->window_size = 0;
         self->state = _PROV_CONSTRUCTED;
@@ -653 +655 @@
                                 /* Update the cursor so it can be returned to the provider. */
                                 cur_borrowed += cur_updated - cur_limited;
-                                if (width != -1) {
+                                if (width != -1 && cur_limited != NULL) {
                                         /* Deallocate duplicated part of the cursor view. */
                                         free(cur_limited);
@@ -833 +835 @@
                                 /* Update the cursor so it can be returned to the provider. */
                                 cur_borrowed += cur_updated - cur_limited;
-                                if (width != -1) {
+                                if (width != -1 && cur_limited != NULL) {
                                         /* Deallocate duplicated part of the cursor view. */
                                         free(cur_limited);

uspace/lib/posix/time.c

@@ -968 +968 @@
         if (task_stats) {
                 total_cycles = (posix_clock_t) (task_stats->kcycles + task_stats->ucycles);
-        }
-        free(task_stats);
-        task_stats = 0;
+                free(task_stats);
+                task_stats = 0;
+        }
 
         return total_cycles;