From eb11e4e425d3d6e703c824fb891b1b0701d683ef Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Apr 2020 08:16:30 +0200 Subject: [PATCH 1/2] fix [-Wformat=] issue on 32-bit --- emit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emit.c b/emit.c index 0fd2ebc..234a64e 100644 --- a/emit.c +++ b/emit.c @@ -506,9 +506,9 @@ static int y_write_array( recursive_idx = y_search_recursive(state, (zend_ulong) ht); if (-1 != recursive_idx) { /* create anchor to refer to this structure */ - anchor_size = snprintf(anchor, 0, "refid%ld", recursive_idx + 1); + anchor_size = snprintf(anchor, 0, "refid" ZEND_LONG_FMT, recursive_idx + 1); anchor = (char*) emalloc(anchor_size + 1); - snprintf(anchor, anchor_size + 1, "refid%ld", recursive_idx + 1); + snprintf(anchor, anchor_size + 1, "refid" ZEND_LONG_FMT, recursive_idx + 1); #if PHP_VERSION_ID >= 70300 if (!(GC_FLAGS(ht) & GC_IMMUTABLE) && GC_IS_RECURSIVE(ht)) { From a5a7f14f37c1d530e8e9868945f4c08af26ba8a9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Apr 2020 08:16:55 +0200 Subject: [PATCH 2/2] relax test on 32-bit (overflow to float) --- tests/bug_79494.phpt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/bug_79494.phpt b/tests/bug_79494.phpt index d388bd8..f4f8b48 100644 --- a/tests/bug_79494.phpt +++ b/tests/bug_79494.phpt @@ -22,13 +22,13 @@ $data = array ( print yaml_emit($data); ?> ---EXPECT-- +--EXPECTF-- --- audio: audioEnabled: - - 132317787432502136 + - 13231778%s - 0 eveampGain: - - 132316833510704299 + - 13231683%s - 0.250000 ...