Changes in uspace/lib/posix/stdio/scanf.c [12fb8498:a12f7f1] in mainline

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