fix segfault in locking utility

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3617 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/busybox/patches/340-lock_util.patch b/openwrt/package/busybox/patches/340-lock_util.patch
index f5c0c2e..bb1cf49 100644 (file)
--- 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
 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>
 +#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;
 +      
 +      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);
 +      fscanf(f, "%d", &i);
 +      if (i > 0)
 +              kill(i, SIGTERM);

++      

 +      fclose(f);
 +
 +      return 0;
 +      fclose(f);
 +
 +      return 0;