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

19990819-12:30 GMT+1

Browse Source
This commit is contained in:
Viktor Szakats
1999-08-19 10:49:00 +00:00
parent 22067122a2
commit e954231699
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -1,3 +1,8 @@
19990819-12:30 GMT+1 Victor Szel <info@szelvesz.hu>
* source/rtl/strings.c
! hb_itemStr() possible error fixed when item.asDouble was
accessed without making sure whether the item is a double.
19990819-00:15 EDT Paul Tucker <ptucker@sympatico.ca>
* source/rtl/gtapi.c
+ hb_gtPreExt()

38
harbour/source/rtl/strings.c
View File

@@ -1234,14 +1234,36 @@ HARBOUR HB_VAL( void )
/* TODO: Move it to itemapi.c */
char * hb_itemStr( PHB_ITEM pNumber, PHB_ITEM pWidth, PHB_ITEM pDec )
{
char * szResult = 0;
char * szResult = NULL;
if( pNumber )
{
/* Default to the width and number of decimals specified by the item,
with a limit of 20 integer places and 9 decimal places */
int iWidth = pNumber->item.asDouble.length;
int iDec = pNumber->item.asDouble.decimal;
int iWidth;
int iDec;
if ( IS_DOUBLE( pNumber ) )
{
iWidth = pNumber->item.asDouble.length;
iDec = pNumber->item.asDouble.decimal;
}
else if ( IS_INTEGER( pNumber ) )
{
iWidth = pNumber->item.asInteger.length;
iDec = 0;
}
else if ( IS_LONG( pNumber ) )
{
iWidth = pNumber->item.asLong.length;
iDec = 0;
}
else
{
iWidth = 0;
iDec = 0;
}
if( iWidth > 20 )
iWidth = 20;
if( iDec > 9 )
@@ -1301,14 +1323,14 @@ char * hb_itemStr( PHB_ITEM pNumber, PHB_ITEM pWidth, PHB_ITEM pDec )
}
else switch( pNumber->type & ~IT_BYREF )
{
case IT_LONG:
iBytes = sprintf( szResult, "%*li", iWidth, pNumber->item.asLong.value );
break;
case IT_INTEGER:
iBytes = sprintf( szResult, "%*i", iWidth, pNumber->item.asInteger.value );
break;
case IT_LONG:
iBytes = sprintf( szResult, "%*li", iWidth, pNumber->item.asLong.value );
break;
default:
iBytes = 0;
*szResult = 0;
@@ -1318,7 +1340,7 @@ char * hb_itemStr( PHB_ITEM pNumber, PHB_ITEM pWidth, PHB_ITEM pDec )
if( iBytes > iSize )
{
memset( szResult, '*', iSize );
szResult[ iSize ] = 0;
szResult[ iSize ] = '\0';
}
}
}