From 556a6cbc2d483d280e65328361f4c2d86639295d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Sun, 19 Oct 2014 14:46:35 +0200 Subject: [PATCH] 2014-10-19 14:46 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/rtl/gtwvt/gtwvt.c * small cleanup in HB_GTI_UNITRANS --- ChangeLog.txt | 4 ++++ src/rtl/gtwvt/gtwvt.c | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 6730f30b95..878358fdeb 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,10 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2014-10-19 14:46 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/rtl/gtwvt/gtwvt.c + * small cleanup in HB_GTI_UNITRANS + 2014-10-17 14:55 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * include/hbrddcdx.h * src/rdd/dbfcdx/dbfcdx1.c diff --git a/src/rtl/gtwvt/gtwvt.c b/src/rtl/gtwvt/gtwvt.c index 6d757560ab..c6661c23c6 100644 --- a/src/rtl/gtwvt/gtwvt.c +++ b/src/rtl/gtwvt/gtwvt.c @@ -3761,6 +3761,9 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) } } break; + + case HB_GTI_UNITRANS: + break; #else case HB_GTI_UNITRANS: if( pWVT->wcTrans ) @@ -3769,9 +3772,13 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING ) { if( pWVT->wcTrans ) + { hb_itemFreeC( ( char * ) pWVT->wcTrans ); + pWVT->wcTrans = NULL; + } pWVT->wcTransLen = hb_itemGetCLen( pInfo->pNewVal ) / sizeof( HB_WCHAR ); - pWVT->wcTrans = pWVT->wcTransLen == 0 ? NULL : + if( pWVT->wcTransLen > 0 ) + pWVT->wcTrans = pWVT->wcTransLen == 0 ? NULL : ( HB_WCHAR * ) hb_itemGetC( pInfo->pNewVal ); } break;