delete

diff --git a/meta b/meta
index 002db4621b5d61020e7fbe8c65a477c7c80a894a..1816839eb8e978d22633ba9876198faad7dd9b00 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: db86ac85de54ebf927c0bd3b15fb88b9f32ffc37
+Previous: 922ea6be6850fde255dc88d29556b49908e12e08
 Head: 5de1f5ff6aaca3df63dc3165c63bd37ba24b7723
 Applied:
 Unapplied:
-  malloc-err: 57342da6cab0db5b9b5dd2f5e75284d1500d2132
   af_ib: 414c0cd9299eadb9748ce805155e267ba6bff585
   name2ip: 8e00708e882239292492e13aa51c82042255933c
   addr_size: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/malloc-err b/patches/malloc-err
deleted file mode 100644 (file)
index addc25f..0000000
--- a/patches/malloc-err
+++ /dev/null
@@ -1,70 +0,0 @@
-Bottom: 42e4729a57fa30e42770d8787e4b6b02c7bf2204
-Top:    ed6a134db24d206a944a53a1ebb514d04d70b176
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-11-28 12:19:13 -0800
-
-After a
-
-
----
-
-diff --git a/src/parse.c b/src/parse.c
-index d1c820f..6ab6041 100644
---- a/src/parse.c
-+++ b/src/parse.c
-@@ -71,14 +71,15 @@ static char *expand(char *basename, char *args, int *str_cnt, int *str_size)
- 
- char **parse(char *args, int *count)
- {
--      char **ptrs;
-+      char **ptrs = NULL;
-       char *str_buf, *cpy, *token, *next;
-       int cnt = 0, str_size = 0;
-       int i;
- 
-       /* make a copy that strtok can modify */
--      cpy = malloc(strlen(args) + 1);
--      strcpy(cpy, args);
-+      cpy = strdup(args);
-+      if (!cpy)
-+              return NULL;
- 
-       if (args[0] == '[') {
-               cpy[0] = '\0';
-@@ -92,6 +93,8 @@ char **parse(char *args, int *count)
-       if (!next) {
-               str_size = strlen(token) + 1;
-               str_buf = malloc(str_size);
-+              if (!str_buf)
-+                      goto out_cpy;
-               strcpy(str_buf, token);
-               cnt = 1;
-       } else {
-@@ -99,6 +102,9 @@ char **parse(char *args, int *count)
-       }
- 
-       ptrs = malloc((sizeof str_buf * (cnt + 1)) + str_size);
-+      if (!ptrs)
-+              goto out_str_buf;
-+
-       memcpy(&ptrs[cnt + 1], str_buf, str_size);
- 
-       ptrs[0] = (char*) &ptrs[cnt + 1];
-@@ -106,10 +112,14 @@ char **parse(char *args, int *count)
-               ptrs[i] = index(ptrs[i - 1], 0) + 1;
-       ptrs[i] = NULL;
- 
--      free(cpy);
--      free(str_buf);
--
-       if (count)
-               *count = cnt;
-+
-+out_str_buf:
-+        free(str_buf);
-+
-+out_cpy:
-+      free(cpy);
-+
-       return ptrs;
- }