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

2010-06-18 15:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/vm/runner.c
  * include/hbcompdf.h
    ! Fixed two more HB_SIZE != HB_ULONG build issues.
This commit is contained in:
Viktor Szakats
2010-06-18 13:05:20 +00:00
parent 38c91a1eee
commit edbc9a4ef7
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-06-18 15:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/vm/runner.c
* include/hbcompdf.h
! Fixed two more HB_SIZE != HB_ULONG build issues.
2010-06-18 13:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/filesys.c
* include/hbapifs.h

2
harbour/include/hbcompdf.h
View File

@@ -667,7 +667,7 @@ typedef struct HB_MACRO_ /* a macro compiled pcode container */
/* macro compiler only members */
char * string; /* compiled string */
HB_ULONG length; /* length of the string */
HB_SIZE length; /* length of the string */
int Flags; /* some flags we may need */
int status; /* status of compilation */
HB_ITEM_PTR pError; /* error object returned from the parser */

9
harbour/src/vm/runner.c
View File

@@ -322,6 +322,7 @@ static PHRB_BODY hb_hrbLoad( const char * szHrbBody, HB_SIZE ulBodySize, HB_USHO
HB_SIZE ulBodyOffset = 0;
HB_SIZE ulSize; /* Size of function */
HB_SIZE ulPos;
HB_ULONG ulValue;
HB_ULONG ul;
char * buffer, ch;
HB_USHORT usBind = ( usMode & HB_HRB_BIND_MODEMASK );
@@ -424,8 +425,12 @@ static PHRB_BODY hb_hrbLoad( const char * szHrbBody, HB_SIZE ulBodySize, HB_USHO
break;
/* Read size of function */
if( ! hb_hrbReadValue( szHrbBody, ulBodySize, &ulBodyOffset, &ulSize ) ||
ulBodyOffset + ulSize > ulBodySize )
if( ! hb_hrbReadValue( szHrbBody, ulBodySize, &ulBodyOffset, &ulValue ) )
break;
ulSize = ( HB_SIZE ) ulValue;
if( ulBodyOffset + ulSize > ulBodySize )
break;
/* Copy function body */