Changeset fd8e8e1 in mainline

Timestamp:

2010-10-30T19:39:29Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

069015f2, 417b12c

Parents:

768ea9e

Message:

Do not leak last_header on failure.

File:

• uspace/srv/net/il/ip/ip.c (modified) (4 diffs)

uspace/srv/net/il/ip/ip.c

@@ -652 +652 @@
                         middle_header = (ip_header_ref) packet_prefix(next,
                             IP_HEADER_LENGTH(last_header));
-                        if (!middle_header)
+                        if (!middle_header) {
+                                free(last_header);
                                 return ENOMEM;
+                        }
 
                         memcpy(middle_header, last_header,
@@ -667 +669 @@
                             IP_HEADER_CHECKSUM(middle_header);
                         if (destination) {
-                                ERROR_PROPAGATE(packet_set_addr(next, NULL,
+                                if (ERROR_OCCURRED(packet_set_addr(next, NULL,
                                     (uint8_t *) destination->value,
                                     CONVERT_SIZE(char, uint8_t,
-                                    destination->length)));
+                                    destination->length)))) {
+                                        free(last_header);
+                                        return ERROR_CODE;
+                                }
                         }
                         length += packet_get_data_length(next);
@@ -678 +683 @@
                 middle_header = (ip_header_ref) packet_prefix(next,
                     IP_HEADER_LENGTH(last_header));
-                if (!middle_header)
+                if (!middle_header) {
+                        free(last_header);
                         return ENOMEM;
+                }
 
                 memcpy(middle_header, last_header,
@@ -692 +699 @@
                     IP_HEADER_CHECKSUM(middle_header);
                 if (destination) {
-                        ERROR_PROPAGATE(packet_set_addr(next, NULL,
+                        if (ERROR_OCCURRED(packet_set_addr(next, NULL,
                             (uint8_t *) destination->value,
-                            CONVERT_SIZE(char, uint8_t, destination->length)));
+                            CONVERT_SIZE(char, uint8_t,
+                            destination->length)))) {
+                                free(last_header);
+                                return ERROR_CODE;
+                            }
                 }
                 length += packet_get_data_length(next);