aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-06-15 21:50:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-06-15 21:50:04 +0000
commit0386ee90ed26717d4fa0fe9e08ad24adb02187da (patch)
tree0db80d44c9abf1e2fbd1d76e3af3f5180a58922a
parent90d54c0faaaaf14edad59185d6066c5b32273dcb (diff)
downloadupstream-0386ee90ed26717d4fa0fe9e08ad24adb02187da.tar.gz
upstream-0386ee90ed26717d4fa0fe9e08ad24adb02187da.tar.bz2
upstream-0386ee90ed26717d4fa0fe9e08ad24adb02187da.zip
fix awk segfault
SVN-Revision: 7640
-rw-r--r--package/busybox/patches/400-revert_awk_getopt.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/busybox/patches/400-revert_awk_getopt.patch b/package/busybox/patches/400-revert_awk_getopt.patch
index d9c7cfb709..33c6790fe1 100644
--- a/package/busybox/patches/400-revert_awk_getopt.patch
+++ b/package/busybox/patches/400-revert_awk_getopt.patch
@@ -1,7 +1,7 @@
Index: busybox-1.4.2/editors/awk.c
===================================================================
---- busybox-1.4.2.orig/editors/awk.c 2007-06-04 13:21:32.083099296 +0200
-+++ busybox-1.4.2/editors/awk.c 2007-06-04 13:21:35.202625056 +0200
+--- busybox-1.4.2.orig/editors/awk.c 2007-06-15 23:43:26.460690280 +0200
++++ busybox-1.4.2/editors/awk.c 2007-06-15 23:45:26.283474448 +0200
@@ -2639,14 +2639,13 @@
int awk_main(int argc, char **argv)
@@ -18,7 +18,7 @@ Index: busybox-1.4.2/editors/awk.c
/* Undo busybox.c, or else strtod may eat ','! This breaks parsing:
* $1,$2 == '$1,' '$2', NOT '$1' ',' '$2' */
-@@ -2694,40 +2693,54 @@
+@@ -2694,40 +2693,56 @@
free(s);
}
@@ -83,13 +83,13 @@ Index: busybox-1.4.2/editors/awk.c
- parse_program(s + 1);
- free(s);
- } else { // no -f: take program from 1st parameter
-- if (!argc)
-- bb_show_usage();
+ }
+ argc -= optind;
+ argv += optind;
+
+ if (!programname) {
+ if (!argc)
+ bb_show_usage();
programname = "cmd. line";
parse_program(*argv++);
argc--;