Changeset f4c8a83f in mainline for uspace/lib/c/generic/adt/measured_strings.c

Timestamp:

2010-10-27T20:52:47Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

09d5ec8

Parents:

d2b1040

Message:

Do not leak memory buffers due ERROR_PROPAGATE.

File:

• uspace/lib/c/generic/adt/measured_strings.c (modified) (2 diffs)

uspace/lib/c/generic/adt/measured_strings.c

@@ -187 +187 @@
                                 return EINVAL;
                         }
-                        ERROR_PROPAGATE(async_data_write_finalize(callid, next,
-                            lengths[index]));
+                        if (ERROR_OCCURRED(async_data_write_finalize(callid,
+                            next, lengths[index]))) {
+                                free(*data);
+                                free(*strings);
+                                free(lengths);
+                                return ERROR_CODE;
+                        }
                         (*strings)[index].value = next;
                         next += lengths[index];
@@ -345 +350 @@
                 (*strings)[index].length = lengths[index];
                 if (lengths[index] > 0) {
-                        ERROR_PROPAGATE(async_data_read_start(phone, next,
-                            lengths[index]));
+                        if (ERROR_OCCURRED(async_data_read_start(phone, next,
+                            lengths[index]))) {
+                                free(lengths);
+                                free(data);
+                                free(strings);
+                                return ERROR_CODE;
+                        }
                         (*strings)[index].value = next;
                         next += lengths[index];