From: Marcus Boerger <helly@php.net>
Date: Wed, 6 Nov 2002 10:43:41 +0000 (+0000)
Subject: fix locks and reading
X-Git-Tag: php-4.3.0RC1~231
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fb5e192fb8af851a12006bb2a72a6334a52e798;p=php

fix locks and reading
#i will extend the tests to guard on such failures
---

diff --git a/ext/dba/dba_flatfile.c b/ext/dba/dba_flatfile.c
index 4976f32e56..d64a7feec1 100644
--- a/ext/dba/dba_flatfile.c
+++ b/ext/dba/dba_flatfile.c
@@ -157,16 +157,16 @@ DBA_CLOSE_FUNC(flatfile)
 {
 	DBM_DATA;
 
+	if (dba->lockfn) {
 #if NFS_HACK
-	VCWD_UNLINK(dba->lockfn);
+		VCWD_UNLINK(dba->lockfn);
 #else
-	if (dba->lockfn) {
 		/*dba->lockfd = VCWD_OPEN_MODE(dba->lockfn, O_RDWR, 0644);*/
 		flock(dba->lockfd, LOCK_UN);
 		close(dba->lockfd);
-	}
 #endif
-	efree(dba->lockfn);
+		efree(dba->lockfn);
+	}
 
 	php_stream_close(dba->fp);
 	if (dba->nextkey.dptr)