fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-04-29 18:12 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/rtl/filesys.c
    ! fixed time checking in *nix version of hb_fsPipeIsData()

  * harbour/contrib/hbwin/win_bmp.c
    ! fixed buffer overflow
This commit is contained in:
Przemyslaw Czerpak
2011-04-29 16:13:07 +00:00
parent c2b35cdd9d
commit 2b98d23bec
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -16,6 +16,13 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-04-29 18:12 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/rtl/filesys.c
! fixed time checking in *nix version of hb_fsPipeIsData()
* harbour/contrib/hbwin/win_bmp.c
! fixed buffer overflow
2011-04-29 11:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/hbqt_common.hbc
* reverted: 2011-04-19 21:15 UTC+0200 Viktor Szakats

2
harbour/contrib/hbwin/win_bmp.c
View File

@@ -107,7 +107,7 @@ HB_FUNC( WIN_LOADBITMAPFILE )
[vszakats] */
if( nSize > 2 && nSize <= ( 32 * 1024 * 1024 ) )
{
void * pbmfh = hb_xgrab( nSize );
void * pbmfh = hb_xgrab( nSize + 1 );
hb_fsSeek( fhnd, 0, FS_SET );

2
harbour/src/rtl/filesys.c
View File

@@ -949,6 +949,8 @@ HB_SIZE hb_fsPipeIsData( HB_FHANDLE hPipeHandle, HB_SIZE nBufferSize,
FD_SET( hPipeHandle, &rfds );
iResult = select( hPipeHandle + 1, &rfds, NULL, NULL, &tv );
hb_fsSetIOError( iResult >= 0, 0 );
if( nTimeOut < 0 && iResult == 0 )
continue;
if( iResult != -1 || nTimeOut == 0 || errno != EINTR ||
hb_vmRequestQuery() != 0 )
break;