From d89e99cbb064253bccbfe297a79bf568a50e3c8e Mon Sep 17 00:00:00 2001 From: Aleksander Czajczynski Date: Sat, 22 Apr 2017 21:24:19 +0200 Subject: [PATCH] 2017-04-22 21:22 UTC+0200 Aleksander Czajczynski (hb fki.pl) * contrib/hbamf/amfenc.c ! fix trivial mistake in AMF3_ENCODE(), which broke string deduplication after hash with string-keys was serialized in object tree. The hash itself was serialized correctly because keys are by definition unique. --- ChangeLog.txt | 7 +++++++ contrib/hbamf/amfenc.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index fa6fa55ce6..1e08d7aa76 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,13 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2017-04-22 21:22 UTC+0200 Aleksander Czajczynski (hb fki.pl) + * contrib/hbamf/amfenc.c + ! fix trivial mistake in AMF3_ENCODE(), which broke string + deduplication after hash with string-keys was serialized + in object tree. The hash itself was serialized correctly + because keys are by definition unique. + 2017-04-20 10:01 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/3rd/zlib/* * updated to version 1.2.11 diff --git a/contrib/hbamf/amfenc.c b/contrib/hbamf/amfenc.c index c2e3104852..042baf4614 100644 --- a/contrib/hbamf/amfenc.c +++ b/contrib/hbamf/amfenc.c @@ -443,7 +443,7 @@ static HB_BOOL amf3_encode_hash( amfContext * context, PHB_ITEM pItem ) pVal = hb_hashGetValueAt( pItem, i ); if( HB_IS_STRING( pKey ) ) { - if( ! amf3_encode_string( context, pKey ) ) + if( ! amf3_serialize_string( context, pKey ) ) return HB_FALSE; if( ! amf3_encode( context, pVal ) ) return HB_FALSE;