Have io_reader.match7 check io_reader.is_closed

google · Feb 22, 2020 · b2dd7d9 · b2dd7d9
1 parent b1e3a15
commit b2dd7d9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/internal/cgen/base/io-private.h b/internal/cgen/base/io-private.h
@@ -176,7 +176,10 @@ wuffs_base__io_writer__copy_n32_from_slice(uint8_t** ptr_iop_w,
 //  - 1 means inconclusive, equivalent to "$short read".
 //  - 2 means failure.
 static inline uint32_t  //
-wuffs_base__io_reader__match7(uint8_t* iop_r, uint8_t* io2_r, uint64_t a) {
+wuffs_base__io_reader__match7(uint8_t* iop_r,
+                              uint8_t* io2_r,
+                              wuffs_base__io_buffer* r,
+                              uint64_t a) {
   uint32_t n = a & 7;
   a >>= 8;
   if ((io2_r - iop_r) >= 8) {
@@ -186,7 +189,7 @@ wuffs_base__io_reader__match7(uint8_t* iop_r, uint8_t* io2_r, uint64_t a) {
   }
   for (; n > 0; n--) {
     if (iop_r >= io2_r) {
-      return 1;
+      return (r && r->meta.closed) ? 2 : 1;
     } else if (*iop_r != ((uint8_t)(a))) {
       return 2;
     }

diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go
@@ -169,7 +169,8 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args []
 		return nil
 
 	case t.IDMatch7:
-		b.printf("wuffs_base__io_reader__match7(%s%s,  %s%s,", iopPrefix, name, io2Prefix, name)
+		b.printf("wuffs_base__io_reader__match7(%s%s, %s%s, %s,",
+			iopPrefix, name, io2Prefix, name, name)
 		if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil {
 			return err
 		}

diff --git a/internal/cgen/data.go b/internal/cgen/data.go
diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c
@@ -6347,7 +6347,10 @@ wuffs_base__io_writer__copy_n32_from_slice(uint8_t** ptr_iop_w,
 //  - 1 means inconclusive, equivalent to "$short read".
 //  - 2 means failure.
 static inline uint32_t  //
-wuffs_base__io_reader__match7(uint8_t* iop_r, uint8_t* io2_r, uint64_t a) {
+wuffs_base__io_reader__match7(uint8_t* iop_r,
+                              uint8_t* io2_r,
+                              wuffs_base__io_buffer* r,
+                              uint64_t a) {
   uint32_t n = a & 7;
   a >>= 8;
   if ((io2_r - iop_r) >= 8) {
@@ -6357,7 +6360,7 @@ wuffs_base__io_reader__match7(uint8_t* iop_r, uint8_t* io2_r, uint64_t a) {
   }
   for (; n > 0; n--) {
     if (iop_r >= io2_r) {
-      return 1;
+      return (r && r->meta.closed) ? 2 : 1;
     } else if (*iop_r != ((uint8_t)(a))) {
       return 2;
     }
@@ -19056,7 +19059,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
           }
           goto label_0_continue;
         } else if (v_class == 9) {
-          v_match = wuffs_base__io_reader__match7(iop_a_src, io2_a_src,
+          v_match = wuffs_base__io_reader__match7(iop_a_src, io2_a_src, a_src,
                                                   111546413966853);
           if (v_match == 0) {
             *iop_a_dst++ = wuffs_base__make_token(
@@ -19076,8 +19079,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
             goto label_0_continue;
           }
         } else if (v_class == 10) {
-          v_match =
-              wuffs_base__io_reader__match7(iop_a_src, io2_a_src, 435762131972);
+          v_match = wuffs_base__io_reader__match7(iop_a_src, io2_a_src, a_src,
+                                                  435762131972);
           if (v_match == 0) {
             *iop_a_dst++ = wuffs_base__make_token(
                 (((uint64_t)(4194433)) << WUFFS_BASE__TOKEN__VALUE__SHIFT) |
@@ -19096,8 +19099,8 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
             goto label_0_continue;
           }
         } else if (v_class == 11) {
-          v_match =
-              wuffs_base__io_reader__match7(iop_a_src, io2_a_src, 465676103172);
+          v_match = wuffs_base__io_reader__match7(iop_a_src, io2_a_src, a_src,
+                                                  465676103172);
           if (v_match == 0) {
             *iop_a_dst++ = wuffs_base__make_token(
                 (((uint64_t)(4194337)) << WUFFS_BASE__TOKEN__VALUE__SHIFT) |