From 600cd96cf47788ee3a74b40a6028b035c9fd6a61 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 20 Jul 2021 14:22:02 +1000 Subject: Run script/sync.sh --- release/c/wuffs-v0.3.c | 26 ++++++++++++++------------ sync.txt | 8 ++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/release/c/wuffs-v0.3.c b/release/c/wuffs-v0.3.c index 4d64d99..2cbe5ed 100644 --- a/release/c/wuffs-v0.3.c +++ b/release/c/wuffs-v0.3.c @@ -84,15 +84,15 @@ extern "C" { // each major.minor branch, the commit count should increase monotonically. // // WUFFS_VERSION was overridden by "wuffs gen -version" based on revision -// 6a30c1ede0dc765fbbc443b2536b7691485be9fb committed on 2021-07-18. +// 77f855206d6b458ffe892dd5cf19150b1de63f24 committed on 2021-07-20. #define WUFFS_VERSION 0x000030000 #define WUFFS_VERSION_MAJOR 0 #define WUFFS_VERSION_MINOR 3 #define WUFFS_VERSION_PATCH 0 -#define WUFFS_VERSION_PRE_RELEASE_LABEL "beta.7" -#define WUFFS_VERSION_BUILD_METADATA_COMMIT_COUNT 3069 -#define WUFFS_VERSION_BUILD_METADATA_COMMIT_DATE 20210718 -#define WUFFS_VERSION_STRING "0.3.0-beta.7+3069.20210718" +#define WUFFS_VERSION_PRE_RELEASE_LABEL "beta.8" +#define WUFFS_VERSION_BUILD_METADATA_COMMIT_COUNT 3072 +#define WUFFS_VERSION_BUILD_METADATA_COMMIT_DATE 20210720 +#define WUFFS_VERSION_STRING "0.3.0-beta.8+3072.20210720" // ---------------- Configuration @@ -33097,16 +33097,19 @@ wuffs_json__decoder__decode_comment( } while (true) { if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) { - if (v_length > 0) { + if (a_src && a_src->meta.closed) { + *iop_a_dst++ = wuffs_base__make_token( + (((uint64_t)(4)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | + (((uint64_t)(v_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); + self->private_impl.f_comment_type = 2; + status = wuffs_base__make_status(NULL); + goto ok; + } else if (v_length > 0) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(v_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); } - if (a_src && a_src->meta.closed) { - status = wuffs_base__make_status(wuffs_json__error__bad_input); - goto exit; - } status = wuffs_base__make_status(wuffs_base__suspension__short_read); WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6); v_length = 0; @@ -33114,10 +33117,9 @@ wuffs_json__decoder__decode_comment( } v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src); if (v_c == 10) { - iop_a_src += 1; *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)((v_length + 1))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); + (((uint64_t)(v_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); self->private_impl.f_comment_type = 2; status = wuffs_base__make_status(NULL); goto ok; diff --git a/sync.txt b/sync.txt index 11fe9aa..fed943d 100644 --- a/sync.txt +++ b/sync.txt @@ -1,8 +1,8 @@ -script/sync.sh ran on 2021-07-18 -Sibling directory (../wuffs) git revision is e88e28259ea54c65dfc9dd7c88255c6f15e20538 +script/sync.sh ran on 2021-07-20 +Sibling directory (../wuffs) git revision is 1b9a6cb85b9f359595bd264d4c95da5d1291adc5 Manifest (sha256sum values, filenames, versions): bb28889a02c5d89edf6544ded21495462d1f998f8ffa5d095f53ca5db29e2937 release/c/README.md 3b6a0c78f663bb495d1972fbb2a87c717d70fbac5ea8cc1a50cb9afaa4b03f92 release/c/wuffs-v0.2.c #define WUFFS_VERSION_STRING "0.2.0+2078.20191219" -f13974bb0ae339776d841876cb3290988c67c02adb31f04de4405b7c64e9a097 release/c/wuffs-v0.3.c - #define WUFFS_VERSION_STRING "0.3.0-beta.7+3069.20210718" +107581063b61919e529c7961b8a0c8a8c211565ba6fdd02f68fcd85908c37df3 release/c/wuffs-v0.3.c + #define WUFFS_VERSION_STRING "0.3.0-beta.8+3072.20210720" -- cgit v1.2.3