Changeset 6c69d19 in mainline for uspace/lib/posix/stdio/scanf.c

Timestamp:

2011-07-25T20:34:17Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

00c2de63, c936c7f

Parents:

5889fc74 (diff), d542aad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix.

File:

• uspace/lib/posix/stdio/scanf.c (modified) (3 diffs)

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);