package/config; br2_symbol_printer(): fix off-by-1 in string handling

Based on patch by bbj17@gmx.de.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/config/patches/08-make-write-deps.patch b/package/config/patches/08-make-write-deps.patch
index 0f9c7e308ffddd841d6c8a1077e085276e38cbdf..b69daad6ede7d6e0f238ad4435e126ace63c43c1 100644 (file)
--- a/package/config/patches/08-make-write-deps.patch
+++ b/package/config/patches/08-make-write-deps.patch
@@ -16,12 +16,12 @@ Index: config/util.c
 +      char *ret;
 +      if (len < 1)
 +              return NULL;
-+      ret = malloc(len);
++      ret = malloc(len+1);
 +      if (!ret) {
 +              printf("Out of memory!");
 +              exit(1);
 +      }
-+      memset(ret, 0, len);
++      memset(ret, 0, len+1);
 +      i = j = 0;
 +      if (strncmp("BR2_", in, 4) == 0)
 +              i += 4;
@@ -34,7 +34,7 @@ Index: config/util.c
 +      return ret;
 +}
 +
-+/* write dependencies of the infividual config-symbols */
++/* write dependencies of the individual config-symbols */
 +static int write_make_deps(const char *name)
 +{
 +      char *str;

diff --git a/package/config/util.c b/package/config/util.c
index 5fc36c7d26c108f2f2aa685d994afffef51ed09d..f962cef31177ecbc409e9115dc0a39bab83984d0 100644 (file)
--- a/package/config/util.c
+++ b/package/config/util.c
@@ -35,12 +35,12 @@ static char* br2_symbol_printer(const char * const in)
        char *ret;
        if (len < 1)
                return NULL;
-       ret = malloc(len);
+       ret = malloc(len+1);
        if (!ret) {
                printf("Out of memory!");
                exit(1);
        }
-       memset(ret, 0, len);
+       memset(ret, 0, len+1);
        i = j = 0;
        if (strncmp("BR2_", in, 4) == 0)
                i += 4;
@@ -53,7 +53,7 @@ static char* br2_symbol_printer(const char * const in)
        return ret;
 }
 
-/* write dependencies of the infividual config-symbols */
+/* write dependencies of the individual config-symbols */
 static int write_make_deps(const char *name)
 {
        char *str;