diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-04-11 13:54:43 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-04-11 13:54:43 +0000 |
| commit | e01c7553ad0ab05f5c40ef2bdc76b52d4be6fc6c (patch) | |
| tree | 938946307d84bb34036fe68291eeb0dc30f98eef | |
| parent | a9e05f35146e9ef4e817a4987d071ff88134a654 (diff) | |
fix segfault in locking utility
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3617 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | openwrt/package/busybox/patches/340-lock_util.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/openwrt/package/busybox/patches/340-lock_util.patch b/openwrt/package/busybox/patches/340-lock_util.patch index f5c0c2e89..bb1cf49a7 100644 --- a/openwrt/package/busybox/patches/340-lock_util.patch +++ b/openwrt/package/busybox/patches/340-lock_util.patch @@ -39,7 +39,7 @@ diff -urN busybox.old/miscutils/Makefile.in busybox.dev/miscutils/Makefile.in diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c --- busybox.old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100 +++ busybox.dev/miscutils/lock.c 2006-04-05 01:07:12.000000000 +0200 -@@ -0,0 +1,125 @@ +@@ -0,0 +1,128 @@ +#include <sys/types.h> +#include <sys/file.h> +#include <sys/stat.h> @@ -77,10 +77,13 @@ diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c + FILE *f; + int i; + -+ f = fopen(file, "r"); ++ if ((f = fopen(file, "r")) == NULL) ++ return 0; ++ + fscanf(f, "%d", &i); + if (i > 0) + kill(i, SIGTERM); ++ + fclose(f); + + return 0; |