From 142af9e7a97cd8f4722736ca1d3f9a84232ac088 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 23 Sep 2010 23:57:46 +0000 Subject: [PATCH] 2010-09-24 01:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmzip/hbmzip.c ! Fixed potential GPF in HB_ZIPDELETEFILE() and HB_UNZIPFILEINFO() Report and patch by Leandro Damasio. Thanks. * INSTALL - Deleted actual example value from HB_QTPOSTFIX. Users were setting this unnecessarily thinking they need it. The minority how really need this will know what this is about anyway. --- harbour/ChangeLog | 10 ++++++++++ harbour/INSTALL | 2 +- harbour/contrib/hbmzip/hbmzip.c | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 591ada4c8c..8b5d5b2ba2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-24 01:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbmzip/hbmzip.c + ! Fixed potential GPF in HB_ZIPDELETEFILE() and HB_UNZIPFILEINFO() + Report and patch by Leandro Damasio. Thanks. + + * INSTALL + - Deleted actual example value from HB_QTPOSTFIX. Users were setting + this unnecessarily thinking they need it. The minority how really + need this will know what this is about anyway. + 2010-09-23 17:36 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbwin/olecore.c * harbour/contrib/hbwin/hbolesrv.c diff --git a/harbour/INSTALL b/harbour/INSTALL index eb8938d365..3059af3fea 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -363,7 +363,7 @@ HARBOUR You can override automatic detection of QT 'moc', 'rcc' and 'uic' tools by using HB_QTPATH and optionally HB_QTPOSTFIX envvars, f.e.: HB_QTPATH=/opt/qt46/bin/ - HB_QTPOSTFIX=-qt4 + HB_QTPOSTFIX= Certain contribs can be instructed (when using .hbc files) to link against static build of their 3rd party lib dependencies: diff --git a/harbour/contrib/hbmzip/hbmzip.c b/harbour/contrib/hbmzip/hbmzip.c index cce3cb61d0..73b3913c9c 100644 --- a/harbour/contrib/hbmzip/hbmzip.c +++ b/harbour/contrib/hbmzip/hbmzip.c @@ -450,7 +450,7 @@ HB_FUNC( HB_UNZIPFILEINFO ) { char * pszComment = ( char * ) hb_xgrab( ufi.size_file_comment + 1 ); - iResult = unzGetCurrentFileInfo( hUnzip, NULL, NULL, 0, NULL, 0, + iResult = unzGetCurrentFileInfo( hUnzip, &ufi, NULL, 0, NULL, 0, pszComment, ufi.size_file_comment ); pszComment[ ufi.size_file_comment ] = '\0'; if( iResult != UNZ_OK ) @@ -1391,7 +1391,7 @@ static int hb_zipDeleteFile( const char* szZipFile, const char* szFileMask ) if( ufi.size_file_comment ) pszFileComment = ( char * ) hb_xgrab( ufi.size_file_comment + 1 ); - iResult = unzGetCurrentFileInfo( hUnzip, NULL, NULL, 0, + iResult = unzGetCurrentFileInfo( hUnzip, &ufi, NULL, 0, pExtraField, ufi.size_file_extra, pszFileComment, ufi.size_file_comment ); if( pszFileComment )