From 71ed4fd5da1fed5e6ad20b010f776afb6865a9f3 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Fri, 2 Sep 2011 12:03:23 +0000 Subject: [PATCH] 2011-09-02 14:03 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/ChangeLog ! formatting to 80 columns * harbour/src/rtl/filebuf.c ! fixed GPF in file locking code. Many thanks to Kultyshev Igor Anatolevich for reporting the bug and locating exact reason of the problem. [TOMERGE 3.0] --- harbour/ChangeLog | 15 +++++++++++++-- harbour/src/rtl/filebuf.c | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 71133a97ba..b22f91407c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2011-09-02 14:03 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/ChangeLog + ! formatting to 80 columns + + * harbour/src/rtl/filebuf.c + ! fixed GPF in file locking code. + Many thanks to Kultyshev Igor Anatolevich for reporting the bug + and locating exact reason of the problem. + [TOMERGE 3.0] + 2011-08-30 12:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/xhb/xhb.hbp * harbour/contrib/xhb/xhb.hbx @@ -56,8 +66,9 @@ 2011-08-29 17:00 UTC+0100 Jean Lefebvre mafact (jfl@mafact.com) * contrib/rddads/ads1.c - + Enhanced: growning ahIndex from 50 to 512 to allows virtually unlimited TAG - Needed for Free Text search where each field must be indexed. + + Enhanced: growning ahIndex from 50 to 512 to allows virtually unlimited + TAG. Needed for Free Text search where each field must be + indexed. (would otherwhise generate an ADS error 5005). 2011-08-28 22:28 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) diff --git a/harbour/src/rtl/filebuf.c b/harbour/src/rtl/filebuf.c index d2feaa5483..c669f37645 100644 --- a/harbour/src/rtl/filebuf.c +++ b/harbour/src/rtl/filebuf.c @@ -296,7 +296,7 @@ static HB_BOOL hb_fileUnlock( PHB_FILE pFile, HB_BOOL * pfLockFS, { hb_fileInsertLock( pFile, uiPos + 1, nStart + nLen, pLock->start + pLock->len - nStart - nLen ); - pLock->len = nStart - pLock->start; + pFile->pLocks[ uiPos ].len = nStart - pLock->start; } if( pFile->shared ) * pfLockFS = HB_TRUE;