From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 11 Apr 2006 13:54:43 +0000 (+0000)
Subject: fix segfault in locking utility
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=39eb9b16cbf4257e423662c2fa09f439e92ca5ef;p=openwrt%2Fstaging%2Fblocktrron.git

fix segfault in locking utility

SVN-Revision: 3617
---

diff --git a/openwrt/package/busybox/patches/340-lock_util.patch b/openwrt/package/busybox/patches/340-lock_util.patch
index f5c0c2e89e..bb1cf49a77 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;