diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2012-05-11 07:35:54 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-05-11 15:04:40 +0000 |
commit | a52c9d823621e469d6052aac1f4aab74cce1fe10 (patch) | |
tree | 7e77924beff0ce35b9d617cb2b4e49044bcea18e /main/make/make-3.82-memory-corruption.patch | |
parent | 57c239705f8015256d026af6b5d5f7651757d9bd (diff) | |
download | aports-a52c9d823621e469d6052aac1f4aab74cce1fe10.tar.bz2 aports-a52c9d823621e469d6052aac1f4aab74cce1fe10.tar.xz |
main/make: apply various patches
various patches from upstream, gentoo or fedora
Diffstat (limited to 'main/make/make-3.82-memory-corruption.patch')
-rw-r--r-- | main/make/make-3.82-memory-corruption.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/main/make/make-3.82-memory-corruption.patch b/main/make/make-3.82-memory-corruption.patch new file mode 100644 index 0000000000..b52dd6e0b9 --- /dev/null +++ b/main/make/make-3.82-memory-corruption.patch @@ -0,0 +1,37 @@ +--- ./function.c 2011/04/18 01:25:20 1.121 ++++ ./function.c 2011/05/02 12:35:01 1.122 +@@ -706,7 +706,7 @@ + const char *word_iterator = argv[0]; + char buf[20]; + +- while (find_next_token (&word_iterator, (unsigned int *) 0) != 0) ++ while (find_next_token (&word_iterator, NULL) != 0) + ++i; + + sprintf (buf, "%d", i); +@@ -1133,21 +1133,14 @@ + + /* Find the maximum number of words we'll have. */ + t = argv[0]; +- wordi = 1; +- while (*t != '\0') ++ wordi = 0; ++ while ((p = find_next_token (&t, NULL)) != 0) + { +- char c = *(t++); +- +- if (! isspace ((unsigned char)c)) +- continue; +- ++ ++t; + ++wordi; +- +- while (isspace ((unsigned char)*t)) +- ++t; + } + +- words = xmalloc (wordi * sizeof (char *)); ++ words = xmalloc ((wordi == 0 ? 1 : wordi) * sizeof (char *)); + + /* Now assign pointers to each string in the array. */ + t = argv[0]; |