Ticket #1857: 1857-fixing-some-g_malloc-callsNreturn.patch

edit/bookmark.c

@@ -66 +66 @@
     if (!edit->book_mark) {
 /* must have an imaginary top bookmark at line -1 to make things less complicated  */
         edit->book_mark = g_malloc0 (sizeof (struct _book_mark));
+        if (!edit->book_mark)
+            return NULL;
+            
         edit->book_mark->line = -1;
         return edit->book_mark;
     }
@@ -137 +140 @@
     edit->force |= REDRAW_LINE;
     /* create list entry */
     q = g_malloc0 (sizeof (struct _book_mark));
+    if (!q)
+        return;
+
     q->line = line;
     q->c = c;
     q->next = p->next;

edit/choosesyntax.c

@@ -70 +70 @@
     int count = 0;
 
     names = (char**) g_malloc (sizeof (char*));
+    if (!names)
+        return;
+
     names[0] = NULL;
     /* We fill the list of syntax files every time the editor is invoked.
        Instead we could save the list to a file and update it once the syntax

edit/editcmd.c

@@ -1127 +1127 @@
     unsigned char *data;
     cursor = edit->curs1;
     col = edit_get_col (edit);
-    data = g_malloc (TEMP_BUF_LEN);
+    data = g_malloc (TEMP_BUF_LEN * sizeof (*data));
+    if (!data)
+        return 0;
+
     while ((blocklen = mc_read (file, (char *) data, TEMP_BUF_LEN)) > 0) {
         for (width = 0; width < blocklen; width++) {
             if (data[width] == '\n')
@@ -1279 +1282 @@
         edit_push_action (edit, COLUMN_ON);
         column_highlighting = 0;
     } else {
-        copy_buf = g_malloc (end_mark - start_mark);
+        copy_buf = g_malloc ((end_mark - start_mark) * sizeof (*copy_buf));
+        if (!copy_buf)
+            return;
+
         edit_cursor_move (edit, start_mark - edit->curs1);
         edit_scroll_screen_over_cursor (edit);
         count = start_mark;
@@ -1822 +1828 @@
 edit_get_block (WEdit *edit, long start, long finish, int *l)
 {
     unsigned char *s, *r;
-    r = s = g_malloc (finish - start + 1);
+    r = s = g_malloc ((finish - start + 1) * sizeof (*r));
+    if (!r)
+        return;
+
     if (column_highlighting) {
         *l = 0;
         /* copy from buffer, excluding chars that are out of the column 'margins' */
@@ -1878 +1887 @@
         unsigned char *buf;
         int i = start, end;
         len = finish - start;
-        buf = g_malloc (TEMP_BUF_LEN);
-        while (start != finish) {
-            end = min (finish, start + TEMP_BUF_LEN);
-            for (; i < end; i++)
-                buf[i - start] = edit_get_byte (edit, i);
-            len -= mc_write (file, (char *) buf, end - start);
-            start = end;
+        buf = g_malloc (TEMP_BUF_LEN * sizeof (*buf));
+        if (buf) {
+            while (start != finish) {
+                end = min (finish, start + TEMP_BUF_LEN);
+                for (; i < end; i++)
+                    buf[i - start] = edit_get_byte (edit, i);
+                len -= mc_write (file, (char *) buf, end - start);
+                start = end;
+            }
+            g_free (buf);
+        } else {
+            len = 0;
         }
-        g_free (buf);
     }
     mc_close (file);
     if (len)

edit/etags.c

@@ -162 +162 @@
         case in_filename:
             pos = strcspn(buf, ",");
             g_free(filename);
-            filename = g_malloc (pos + 2);
+            filename = g_malloc ((pos + 2) * sizeof (*filename));
+            if (!filename)
+                return 0;
+
             g_strlcpy(filename, (char *)buf, pos + 1);
             state = in_define;
             break;

edit/wordproc.c

@@ -141 +141 @@
 {
     unsigned char *s, *t;
 #if 0
-    t = g_malloc ((q - p) + 2 * (q - p) / option_word_wrap_line_length +
-                  10);
+    t = g_malloc (((q - p) + 2 * (q - p) / option_word_wrap_line_length +
+                  10) * sizeof (*t));
 #else
-    t = g_malloc (2 * (q - p) + 100);
+    t = g_malloc ((2 * (q - p) + 100) * sizeof (*t));
 #endif
     if (!t)
         return 0;