Преглед изворни кода

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>
Peter Korsgaard пре 14 година
родитељ
комит
3ef31b16c1
2 измењених фајлова са 6 додато и 6 уклоњено
  1. 3 3
      package/config/patches/08-make-write-deps.patch
  2. 3 3
      package/config/util.c

+ 3 - 3
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;

+ 3 - 3
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;