Changeset 1370

Timestamp:

07/13/11 00:35:21 (10 months ago)

Author:

stefanct

Message:

fix unchecked malloc calls and casts of malloc return values

in the long term the exit calls should be replaced by returns.
until then this is the correct way to handle failures.

the casts are not needed (in C) and we don't cast malloc return values anywhere else.

Signed-off-by: Stefan Tauner <stefan.tauner@…>
Acked-by: Uwe Hermann <uwe@…>

Location:

trunk

Files:

• flashrom.c (modified) (2 diffs)
• hwaccess.c (modified) (1 diff)
• pcidev.c (modified) (1 diff)
• serial.c (modified) (1 diff)

trunk/flashrom.c

@@ -1514 +1514 @@
 
         msg_cinfo("Erasing and writing flash chip... ");
-        curcontents = (uint8_t *) malloc(size);
+        curcontents = malloc(size);
+        if (!curcontents) {
+                msg_gerr("Out of memory!\n");
+                exit(1);
+        }
         /* Copy oldcontents to curcontents to avoid clobbering oldcontents. */
         memcpy(curcontents, oldcontents, size);
@@ -1881 +1885 @@
         }
 
-        oldcontents = (uint8_t *) malloc(size);
+        oldcontents = malloc(size);
+        if (!oldcontents) {
+                msg_gerr("Out of memory!\n");
+                exit(1);
+        }
         /* Assume worst case: All bits are 0. */
         memset(oldcontents, 0x00, size);
-        newcontents = (uint8_t *) malloc(size);
+        newcontents = malloc(size);
+        if (!newcontents) {
+                msg_gerr("Out of memory!\n");
+                exit(1);
+        }
         /* Assume best case: All bits should be 1. */
         memset(newcontents, 0xff, size);

trunk/hwaccess.c

@@ -227 +227 @@
         struct undo_mmio_write_data *undo_mmio_write_data;              \
         undo_mmio_write_data = malloc(sizeof(struct undo_mmio_write_data)); \
+        if (!undo_mmio_write_data) {                                    \
+                msg_gerr("Out of memory!\n");                           \
+                exit(1);                                                \
+        }                                                               \
         undo_mmio_write_data->addr = a;                                 \
         undo_mmio_write_data->type = mmio_write_type_##c;               \

trunk/pcidev.c

@@ -296 +296 @@
         struct undo_pci_write_data *undo_pci_write_data;                \
         undo_pci_write_data = malloc(sizeof(struct undo_pci_write_data)); \
+        if (!undo_pci_write_data) {                                     \
+                msg_gerr("Out of memory!\n");                           \
+                exit(1);                                                \
+        }                                                               \
         undo_pci_write_data->dev = *a;                                  \
         undo_pci_write_data->reg = b;                                   \

trunk/serial.c

@@ -111 +111 @@
             (tolower((unsigned char)dev[2]) == 'm')) {
                 dev2 = malloc(strlen(dev) + 5);
+                if (!dev2)
+                        sp_die("Error: Out of memory");
                 strcpy(dev2, "\\\\.\\");
                 strcpy(dev2 + 4, dev);