codec: fix passing checkExt appropriately when encoding/decoding an extension

ugorji · ugorji · commit a9af3d3cd758 · 2025-07-29T14:15:24.000-04:00
If encoding or decoding an extension, checkExt must be false once EncodeExt or DecodeExt is called, else we can fall into an infinite loop or bypass encoding/decoding appropriately. Fixes #426
diff --git a/codec/binc.go b/codec/binc.go
@@ -150,7 +150,7 @@ func (e *bincEncDriver[T]) EncodeExt(v interface{}, basetype reflect.Type, xtag
 	if ext == SelfExt {
 		bs0 = e.e.blist.get(1024)
 		bs = bs0
-		sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, true) })
+		sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, false) })
 	} else {
 		bs = ext.WriteExt(v)
 	}
@@ -751,7 +751,7 @@ func (d *bincDecDriver[T]) DecodeExt(rv interface{}, basetype reflect.Type, xtag
 		return
 	}
 	if ext == SelfExt {
-		sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, true) })
+		sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, false) })
 	} else {
 		ext.ReadExt(rv, xbs)
 	}
diff --git a/codec/binc.mono.generated.go b/codec/binc.mono.generated.go
@@ -1137,11 +1137,11 @@ func (e *encoderBincBytes) rawBytes(vv Raw) {
 }
 
 func (e *encoderBincBytes) fn(t reflect.Type) *encFnBincBytes {
-	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)
+	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)
 }
 
 func (e *encoderBincBytes) fnNoExt(t reflect.Type) *encFnBincBytes {
-	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)
+	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)
 }
 
 func (e *encoderBincBytes) mapStart(length int) {
@@ -1615,7 +1615,7 @@ func (d *decoderBincBytes) kInterfaceNaked(f *decFnInfo) (rvn reflect.Value) {
 			} else {
 				rvn = reflect.New(bfn.rt)
 				if bfn.ext == SelfExt {
-					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })
+					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })
 				} else {
 					bfn.ext.ReadExt(rv2i(rvn), bytes)
 				}
@@ -2841,16 +2841,17 @@ func (d *decoderBincBytes) interfaceExtConvertAndDecode(v interface{}, ext Inter
 
 	var vv interface{}
 	d.decode(&vv)
+
 	ext.UpdateExt(v, vv)
 
 }
 
 func (d *decoderBincBytes) fn(t reflect.Type) *decFnBincBytes {
-	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)
+	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)
 }
 
 func (d *decoderBincBytes) fnNoExt(t reflect.Type) *decFnBincBytes {
-	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)
+	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)
 }
 
 func (helperDecDriverBincBytes) newDecoderBytes(in []byte, h Handle) *decoderBincBytes {
@@ -3225,7 +3226,7 @@ func (e *bincEncDriverBytes) EncodeExt(v interface{}, basetype reflect.Type, xta
 	if ext == SelfExt {
 		bs0 = e.e.blist.get(1024)
 		bs = bs0
-		sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, true) })
+		sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, false) })
 	} else {
 		bs = ext.WriteExt(v)
 	}
@@ -3796,7 +3797,7 @@ func (d *bincDecDriverBytes) DecodeExt(rv interface{}, basetype reflect.Type, xt
 		return
 	}
 	if ext == SelfExt {
-		sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, true) })
+		sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, false) })
 	} else {
 		ext.ReadExt(rv, xbs)
 	}
@@ -5206,11 +5207,11 @@ func (e *encoderBincIO) rawBytes(vv Raw) {
 }
 
 func (e *encoderBincIO) fn(t reflect.Type) *encFnBincIO {
-	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)
+	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)
 }
 
 func (e *encoderBincIO) fnNoExt(t reflect.Type) *encFnBincIO {
-	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)
+	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)
 }
 
 func (e *encoderBincIO) mapStart(length int) {
@@ -5684,7 +5685,7 @@ func (d *decoderBincIO) kInterfaceNaked(f *decFnInfo) (rvn reflect.Value) {
 			} else {
 				rvn = reflect.New(bfn.rt)
 				if bfn.ext == SelfExt {
-					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })
+					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })
 				} else {
 					bfn.ext.ReadExt(rv2i(rvn), bytes)
 				}
@@ -6910,16 +6911,17 @@ func (d *decoderBincIO) interfaceExtConvertAndDecode(v interface{}, ext Interfac
 
 	var vv interface{}
 	d.decode(&vv)
+
 	ext.UpdateExt(v, vv)
 
 }
 
 func (d *decoderBincIO) fn(t reflect.Type) *decFnBincIO {
-	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)
+	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)
 }
 
 func (d *decoderBincIO) fnNoExt(t reflect.Type) *decFnBincIO {
-	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)
+	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)
 }
 
 func (helperDecDriverBincIO) newDecoderBytes(in []byte, h Handle) *decoderBincIO {
@@ -7294,7 +7296,7 @@ func (e *bincEncDriverIO) EncodeExt(v interface{}, basetype reflect.Type, xtag u
 	if ext == SelfExt {
 		bs0 = e.e.blist.get(1024)
 		bs = bs0
-		sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, true) })
+		sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, false) })
 	} else {
 		bs = ext.WriteExt(v)
 	}
@@ -7865,7 +7867,7 @@ func (d *bincDecDriverIO) DecodeExt(rv interface{}, basetype reflect.Type, xtag
 		return
 	}
 	if ext == SelfExt {
-		sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, true) })
+		sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, false) })
 	} else {
 		ext.ReadExt(rv, xbs)
 	}
diff --git a/codec/cbor.mono.generated.go b/codec/cbor.mono.generated.go
@@ -1139,11 +1139,11 @@ func (e *encoderCborBytes) rawBytes(vv Raw) {
 }
 
 func (e *encoderCborBytes) fn(t reflect.Type) *encFnCborBytes {
-	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)
+	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)
 }
 
 func (e *encoderCborBytes) fnNoExt(t reflect.Type) *encFnCborBytes {
-	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)
+	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)
 }
 
 func (e *encoderCborBytes) mapStart(length int) {
@@ -1617,7 +1617,7 @@ func (d *decoderCborBytes) kInterfaceNaked(f *decFnInfo) (rvn reflect.Value) {
 			} else {
 				rvn = reflect.New(bfn.rt)
 				if bfn.ext == SelfExt {
-					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })
+					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })
 				} else {
 					bfn.ext.ReadExt(rv2i(rvn), bytes)
 				}
@@ -2843,16 +2843,17 @@ func (d *decoderCborBytes) interfaceExtConvertAndDecode(v interface{}, ext Inter
 
 	var vv interface{}
 	d.decode(&vv)
+
 	ext.UpdateExt(v, vv)
 
 }
 
 func (d *decoderCborBytes) fn(t reflect.Type) *decFnCborBytes {
-	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)
+	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)
 }
 
 func (d *decoderCborBytes) fnNoExt(t reflect.Type) *decFnCborBytes {
-	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)
+	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)
 }
 
 func (helperDecDriverCborBytes) newDecoderBytes(in []byte, h Handle) *decoderCborBytes {
@@ -5121,11 +5122,11 @@ func (e *encoderCborIO) rawBytes(vv Raw) {
 }
 
 func (e *encoderCborIO) fn(t reflect.Type) *encFnCborIO {
-	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)
+	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)
 }
 
 func (e *encoderCborIO) fnNoExt(t reflect.Type) *encFnCborIO {
-	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)
+	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)
 }
 
 func (e *encoderCborIO) mapStart(length int) {
@@ -5599,7 +5600,7 @@ func (d *decoderCborIO) kInterfaceNaked(f *decFnInfo) (rvn reflect.Value) {
 			} else {
 				rvn = reflect.New(bfn.rt)
 				if bfn.ext == SelfExt {
-					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })
+					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })
 				} else {
 					bfn.ext.ReadExt(rv2i(rvn), bytes)
 				}
@@ -6825,16 +6826,17 @@ func (d *decoderCborIO) interfaceExtConvertAndDecode(v interface{}, ext Interfac
 
 	var vv interface{}
 	d.decode(&vv)
+
 	ext.UpdateExt(v, vv)
 
 }
 
 func (d *decoderCborIO) fn(t reflect.Type) *decFnCborIO {
-	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)
+	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)
 }
 
 func (d *decoderCborIO) fnNoExt(t reflect.Type) *decFnCborIO {
-	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)
+	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)
 }
 
 func (helperDecDriverCborIO) newDecoderBytes(in []byte, h Handle) *decoderCborIO {
diff --git a/codec/codec_run_test.go b/codec/codec_run_test.go
@@ -3971,7 +3971,17 @@ func testUpdateExts(nhs ...testNameBasicHandle) {
 		sx(testSelfExtTyp, 78, SelfExt)
 		sx(testSelfExt2Typ, 79, SelfExt)
 		sx(wrapBytesTyp, 32, &tBytesExt)
-		sx(testUintToBytesTyp, 33, &tUintToBytesExt)
+		
+		// binc, cbor and json are not good fits for this generalized extension.
+		// this is because
+		//  - json: will base64 encode a byte into a string, but we don't know the bytesFmt used
+		//  - ...
+		switch nh.n {
+		case "binc", "cbor", "json":
+		default:
+			sx(testUintToBytesTyp, 33, &tUintToBytesExt)
+		}
+		
 		// Now, add extensions for the type wrapInt64 and wrapBytes,
 		// so we can execute the Encode/Decode Ext paths.
 		if nh.n == "simple" {
diff --git a/codec/decode.go b/codec/decode.go
@@ -255,7 +255,7 @@ func (d *decoder[T]) kInterfaceNaked(f *decFnInfo) (rvn reflect.Value) {
 			} else {
 				rvn = reflect.New(bfn.rt)
 				if bfn.ext == SelfExt {
-					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })
+					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })
 				} else {
 					bfn.ext.ReadExt(rv2i(rvn), bytes)
 				}
@@ -1696,11 +1696,11 @@ func (d *decoder[T]) interfaceExtConvertAndDecode(v interface{}, ext InterfaceEx
 }
 
 func (d *decoder[T]) fn(t reflect.Type) *decFn[T] {
-	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)
+	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)
 }
 
 func (d *decoder[T]) fnNoExt(t reflect.Type) *decFn[T] {
-	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)
+	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)
 }
 
 // ----
diff --git a/codec/encode.go b/codec/encode.go
@@ -1296,11 +1296,11 @@ func (e *encoder[T]) rawBytes(vv Raw) {
 }
 
 func (e *encoder[T]) fn(t reflect.Type) *encFn[T] {
-	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)
+	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)
 }
 
 func (e *encoder[T]) fnNoExt(t reflect.Type) *encFn[T] {
-	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)
+	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)
 }
 
 // ---- container tracker methods
diff --git a/codec/json.mono.generated.go b/codec/json.mono.generated.go
@@ -1165,11 +1165,11 @@ func (e *encoderJsonBytes) rawBytes(vv Raw) {
 }
 
 func (e *encoderJsonBytes) fn(t reflect.Type) *encFnJsonBytes {
-	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)
+	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)
 }
 
 func (e *encoderJsonBytes) fnNoExt(t reflect.Type) *encFnJsonBytes {
-	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)
+	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)
 }
 
 func (e *encoderJsonBytes) mapStart(length int) {
@@ -1643,7 +1643,7 @@ func (d *decoderJsonBytes) kInterfaceNaked(f *decFnInfo) (rvn reflect.Value) {
 			} else {
 				rvn = reflect.New(bfn.rt)
 				if bfn.ext == SelfExt {
-					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })
+					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })
 				} else {
 					bfn.ext.ReadExt(rv2i(rvn), bytes)
 				}
@@ -2869,16 +2869,17 @@ func (d *decoderJsonBytes) interfaceExtConvertAndDecode(v interface{}, ext Inter
 
 	var vv interface{}
 	d.decode(&vv)
+
 	ext.UpdateExt(v, vv)
 
 }
 
 func (d *decoderJsonBytes) fn(t reflect.Type) *decFnJsonBytes {
-	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)
+	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)
 }
 
 func (d *decoderJsonBytes) fnNoExt(t reflect.Type) *decFnJsonBytes {
-	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)
+	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)
 }
 
 func (helperDecDriverJsonBytes) newDecoderBytes(in []byte, h Handle) *decoderJsonBytes {
@@ -5323,11 +5324,11 @@ func (e *encoderJsonIO) rawBytes(vv Raw) {
 }
 
 func (e *encoderJsonIO) fn(t reflect.Type) *encFnJsonIO {
-	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)
+	return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)
 }
 
 func (e *encoderJsonIO) fnNoExt(t reflect.Type) *encFnJsonIO {
-	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)
+	return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)
 }
 
 func (e *encoderJsonIO) mapStart(length int) {
@@ -5801,7 +5802,7 @@ func (d *decoderJsonIO) kInterfaceNaked(f *decFnInfo) (rvn reflect.Value) {
 			} else {
 				rvn = reflect.New(bfn.rt)
 				if bfn.ext == SelfExt {
-					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })
+					sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })
 				} else {
 					bfn.ext.ReadExt(rv2i(rvn), bytes)
 				}
@@ -7027,16 +7028,17 @@ func (d *decoderJsonIO) interfaceExtConvertAndDecode(v interface{}, ext Interfac
 
 	var vv interface{}
 	d.decode(&vv)
+
 	ext.UpdateExt(v, vv)
 
 }
 
 func (d *decoderJsonIO) fn(t reflect.Type) *decFnJsonIO {
-	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)
+	return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)
 }
 
 func (d *decoderJsonIO) fnNoExt(t reflect.Type) *decFnJsonIO {
-	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)
+	return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)
 }
 
 func (helperDecDriverJsonIO) newDecoderBytes(in []byte, h Handle) *decoderJsonIO {
diff --git a/codec/msgpack.go b/codec/msgpack.go
@@ -157,7 +157,7 @@ func (e *msgpackEncDriver[T]) EncodeExt(v interface{}, basetype reflect.Type, xt
 	if ext == SelfExt {
 		bs0 = e.e.blist.get(1024)
 		bs = bs0
-		sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, true) })
+		sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, false) })
 	} else {
 		bs = ext.WriteExt(v)
 	}
@@ -900,7 +900,7 @@ func (d *msgpackDecDriver[T]) DecodeExt(rv interface{}, basetype reflect.Type, x
 		return
 	}
 	if ext == SelfExt {
-		sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, true) })
+		sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, false) })
 	} else {
 		ext.ReadExt(rv, xbs)
 	}
diff --git a/codec/msgpack.mono.generated.go b/codec/msgpack.mono.generated.go
diff --git a/codec/simple.go b/codec/simple.go
diff --git a/codec/simple.mono.generated.go b/codec/simple.mono.generated.go

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func (e *bincEncDriver[T]) EncodeExt(v interface{}, basetype reflect.Type, xtag`
`150`	`150`	`if ext == SelfExt {`
`151`	`151`	`bs0 = e.e.blist.get(1024)`
`152`	`152`	`bs = bs0`
`153`		`- sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, true) })`
	`153`	`+ sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, false) })`
`154`	`154`	`} else {`
`155`	`155`	`bs = ext.WriteExt(v)`
`156`	`156`	`}`
`@@ -751,7 +751,7 @@ func (d *bincDecDriver[T]) DecodeExt(rv interface{}, basetype reflect.Type, xtag`
`751`	`751`	`return`
`752`	`752`	`}`
`753`	`753`	`if ext == SelfExt {`
`754`		`- sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, true) })`
	`754`	`+ sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, false) })`
`755`	`755`	`} else {`
`756`	`756`	`ext.ReadExt(rv, xbs)`
`757`	`757`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1137,11 +1137,11 @@ func (e *encoderBincBytes) rawBytes(vv Raw) {`
`1137`	`1137`	`}`
`1138`	`1138`
`1139`	`1139`	`func (e encoderBincBytes) fn(t reflect.Type) encFnBincBytes {`
`1140`		`- return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)`
	`1140`	`+ return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)`
`1141`	`1141`	`}`
`1142`	`1142`
`1143`	`1143`	`func (e encoderBincBytes) fnNoExt(t reflect.Type) encFnBincBytes {`
`1144`		`- return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)`
	`1144`	`+ return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)`
`1145`	`1145`	`}`
`1146`	`1146`
`1147`	`1147`	`func (e *encoderBincBytes) mapStart(length int) {`
`@@ -1615,7 +1615,7 @@ func (d decoderBincBytes) kInterfaceNaked(f decFnInfo) (rvn reflect.Value) {`
`1615`	`1615`	`} else {`
`1616`	`1616`	`rvn = reflect.New(bfn.rt)`
`1617`	`1617`	`if bfn.ext == SelfExt {`
`1618`		`- sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })`
	`1618`	`+ sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })`
`1619`	`1619`	`} else {`
`1620`	`1620`	`bfn.ext.ReadExt(rv2i(rvn), bytes)`
`1621`	`1621`	`}`
`@@ -2841,16 +2841,17 @@ func (d *decoderBincBytes) interfaceExtConvertAndDecode(v interface{}, ext Inter`
`2841`	`2841`
`2842`	`2842`	`var vv interface{}`
`2843`	`2843`	`d.decode(&vv)`
	`2844`	`+`
`2844`	`2845`	`ext.UpdateExt(v, vv)`
`2845`	`2846`
`2846`	`2847`	`}`
`2847`	`2848`
`2848`	`2849`	`func (d decoderBincBytes) fn(t reflect.Type) decFnBincBytes {`
`2849`		`- return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)`
	`2850`	`+ return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)`
`2850`	`2851`	`}`
`2851`	`2852`
`2852`	`2853`	`func (d decoderBincBytes) fnNoExt(t reflect.Type) decFnBincBytes {`
`2853`		`- return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)`
	`2854`	`+ return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)`
`2854`	`2855`	`}`
`2855`	`2856`
`2856`	`2857`	`func (helperDecDriverBincBytes) newDecoderBytes(in []byte, h Handle) *decoderBincBytes {`
`@@ -3225,7 +3226,7 @@ func (e *bincEncDriverBytes) EncodeExt(v interface{}, basetype reflect.Type, xta`
`3225`	`3226`	`if ext == SelfExt {`
`3226`	`3227`	`bs0 = e.e.blist.get(1024)`
`3227`	`3228`	`bs = bs0`
`3228`		`- sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, true) })`
	`3229`	`+ sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, false) })`
`3229`	`3230`	`} else {`
`3230`	`3231`	`bs = ext.WriteExt(v)`
`3231`	`3232`	`}`
`@@ -3796,7 +3797,7 @@ func (d *bincDecDriverBytes) DecodeExt(rv interface{}, basetype reflect.Type, xt`
`3796`	`3797`	`return`
`3797`	`3798`	`}`
`3798`	`3799`	`if ext == SelfExt {`
`3799`		`- sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, true) })`
	`3800`	`+ sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, false) })`
`3800`	`3801`	`} else {`
`3801`	`3802`	`ext.ReadExt(rv, xbs)`
`3802`	`3803`	`}`
`@@ -5206,11 +5207,11 @@ func (e *encoderBincIO) rawBytes(vv Raw) {`
`5206`	`5207`	`}`
`5207`	`5208`
`5208`	`5209`	`func (e encoderBincIO) fn(t reflect.Type) encFnBincIO {`
`5209`		`- return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)`
	`5210`	`+ return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)`
`5210`	`5211`	`}`
`5211`	`5212`
`5212`	`5213`	`func (e encoderBincIO) fnNoExt(t reflect.Type) encFnBincIO {`
`5213`		`- return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)`
	`5214`	`+ return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)`
`5214`	`5215`	`}`
`5215`	`5216`
`5216`	`5217`	`func (e *encoderBincIO) mapStart(length int) {`
`@@ -5684,7 +5685,7 @@ func (d decoderBincIO) kInterfaceNaked(f decFnInfo) (rvn reflect.Value) {`
`5684`	`5685`	`} else {`
`5685`	`5686`	`rvn = reflect.New(bfn.rt)`
`5686`	`5687`	`if bfn.ext == SelfExt {`
`5687`		`- sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })`
	`5688`	`+ sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })`
`5688`	`5689`	`} else {`
`5689`	`5690`	`bfn.ext.ReadExt(rv2i(rvn), bytes)`
`5690`	`5691`	`}`
`@@ -6910,16 +6911,17 @@ func (d *decoderBincIO) interfaceExtConvertAndDecode(v interface{}, ext Interfac`
`6910`	`6911`
`6911`	`6912`	`var vv interface{}`
`6912`	`6913`	`d.decode(&vv)`
	`6914`	`+`
`6913`	`6915`	`ext.UpdateExt(v, vv)`
`6914`	`6916`
`6915`	`6917`	`}`
`6916`	`6918`
`6917`	`6919`	`func (d decoderBincIO) fn(t reflect.Type) decFnBincIO {`
`6918`		`- return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)`
	`6920`	`+ return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)`
`6919`	`6921`	`}`
`6920`	`6922`
`6921`	`6923`	`func (d decoderBincIO) fnNoExt(t reflect.Type) decFnBincIO {`
`6922`		`- return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)`
	`6924`	`+ return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)`
`6923`	`6925`	`}`
`6924`	`6926`
`6925`	`6927`	`func (helperDecDriverBincIO) newDecoderBytes(in []byte, h Handle) *decoderBincIO {`
`@@ -7294,7 +7296,7 @@ func (e *bincEncDriverIO) EncodeExt(v interface{}, basetype reflect.Type, xtag u`
`7294`	`7296`	`if ext == SelfExt {`
`7295`	`7297`	`bs0 = e.e.blist.get(1024)`
`7296`	`7298`	`bs = bs0`
`7297`		`- sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, true) })`
	`7299`	`+ sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, false) })`
`7298`	`7300`	`} else {`
`7299`	`7301`	`bs = ext.WriteExt(v)`
`7300`	`7302`	`}`
`@@ -7865,7 +7867,7 @@ func (d *bincDecDriverIO) DecodeExt(rv interface{}, basetype reflect.Type, xtag`
`7865`	`7867`	`return`
`7866`	`7868`	`}`
`7867`	`7869`	`if ext == SelfExt {`
`7868`		`- sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, true) })`
	`7870`	`+ sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, false) })`
`7869`	`7871`	`} else {`
`7870`	`7872`	`ext.ReadExt(rv, xbs)`
`7871`	`7873`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1139,11 +1139,11 @@ func (e *encoderCborBytes) rawBytes(vv Raw) {`
`1139`	`1139`	`}`
`1140`	`1140`
`1141`	`1141`	`func (e encoderCborBytes) fn(t reflect.Type) encFnCborBytes {`
`1142`		`- return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)`
	`1142`	`+ return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)`
`1143`	`1143`	`}`
`1144`	`1144`
`1145`	`1145`	`func (e encoderCborBytes) fnNoExt(t reflect.Type) encFnCborBytes {`
`1146`		`- return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)`
	`1146`	`+ return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)`
`1147`	`1147`	`}`
`1148`	`1148`
`1149`	`1149`	`func (e *encoderCborBytes) mapStart(length int) {`
`@@ -1617,7 +1617,7 @@ func (d decoderCborBytes) kInterfaceNaked(f decFnInfo) (rvn reflect.Value) {`
`1617`	`1617`	`} else {`
`1618`	`1618`	`rvn = reflect.New(bfn.rt)`
`1619`	`1619`	`if bfn.ext == SelfExt {`
`1620`		`- sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })`
	`1620`	`+ sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })`
`1621`	`1621`	`} else {`
`1622`	`1622`	`bfn.ext.ReadExt(rv2i(rvn), bytes)`
`1623`	`1623`	`}`
`@@ -2843,16 +2843,17 @@ func (d *decoderCborBytes) interfaceExtConvertAndDecode(v interface{}, ext Inter`
`2843`	`2843`
`2844`	`2844`	`var vv interface{}`
`2845`	`2845`	`d.decode(&vv)`
	`2846`	`+`
`2846`	`2847`	`ext.UpdateExt(v, vv)`
`2847`	`2848`
`2848`	`2849`	`}`
`2849`	`2850`
`2850`	`2851`	`func (d decoderCborBytes) fn(t reflect.Type) decFnCborBytes {`
`2851`		`- return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)`
	`2852`	`+ return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)`
`2852`	`2853`	`}`
`2853`	`2854`
`2854`	`2855`	`func (d decoderCborBytes) fnNoExt(t reflect.Type) decFnCborBytes {`
`2855`		`- return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)`
	`2856`	`+ return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)`
`2856`	`2857`	`}`
`2857`	`2858`
`2858`	`2859`	`func (helperDecDriverCborBytes) newDecoderBytes(in []byte, h Handle) *decoderCborBytes {`
`@@ -5121,11 +5122,11 @@ func (e *encoderCborIO) rawBytes(vv Raw) {`
`5121`	`5122`	`}`
`5122`	`5123`
`5123`	`5124`	`func (e encoderCborIO) fn(t reflect.Type) encFnCborIO {`
`5124`		`- return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)`
	`5125`	`+ return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)`
`5125`	`5126`	`}`
`5126`	`5127`
`5127`	`5128`	`func (e encoderCborIO) fnNoExt(t reflect.Type) encFnCborIO {`
`5128`		`- return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)`
	`5129`	`+ return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)`
`5129`	`5130`	`}`
`5130`	`5131`
`5131`	`5132`	`func (e *encoderCborIO) mapStart(length int) {`
`@@ -5599,7 +5600,7 @@ func (d decoderCborIO) kInterfaceNaked(f decFnInfo) (rvn reflect.Value) {`
`5599`	`5600`	`} else {`
`5600`	`5601`	`rvn = reflect.New(bfn.rt)`
`5601`	`5602`	`if bfn.ext == SelfExt {`
`5602`		`- sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })`
	`5603`	`+ sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })`
`5603`	`5604`	`} else {`
`5604`	`5605`	`bfn.ext.ReadExt(rv2i(rvn), bytes)`
`5605`	`5606`	`}`
`@@ -6825,16 +6826,17 @@ func (d *decoderCborIO) interfaceExtConvertAndDecode(v interface{}, ext Interfac`
`6825`	`6826`
`6826`	`6827`	`var vv interface{}`
`6827`	`6828`	`d.decode(&vv)`
	`6829`	`+`
`6828`	`6830`	`ext.UpdateExt(v, vv)`
`6829`	`6831`
`6830`	`6832`	`}`
`6831`	`6833`
`6832`	`6834`	`func (d decoderCborIO) fn(t reflect.Type) decFnCborIO {`
`6833`		`- return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)`
	`6835`	`+ return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)`
`6834`	`6836`	`}`
`6835`	`6837`
`6836`	`6838`	`func (d decoderCborIO) fnNoExt(t reflect.Type) decFnCborIO {`
`6837`		`- return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)`
	`6839`	`+ return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)`
`6838`	`6840`	`}`
`6839`	`6841`
`6840`	`6842`	`func (helperDecDriverCborIO) newDecoderBytes(in []byte, h Handle) *decoderCborIO {`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ func (d decoder[T]) kInterfaceNaked(f decFnInfo) (rvn reflect.Value) {`
`255`	`255`	`} else {`
`256`	`256`	`rvn = reflect.New(bfn.rt)`
`257`	`257`	`if bfn.ext == SelfExt {`
`258`		`- sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })`
	`258`	`+ sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })`
`259`	`259`	`} else {`
`260`	`260`	`bfn.ext.ReadExt(rv2i(rvn), bytes)`
`261`	`261`	`}`
`@@ -1696,11 +1696,11 @@ func (d *decoder[T]) interfaceExtConvertAndDecode(v interface{}, ext InterfaceEx`
`1696`	`1696`	`}`
`1697`	`1697`
`1698`	`1698`	`func (d decoder[T]) fn(t reflect.Type) decFn[T] {`
`1699`		`- return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)`
	`1699`	`+ return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)`
`1700`	`1700`	`}`
`1701`	`1701`
`1702`	`1702`	`func (d decoder[T]) fnNoExt(t reflect.Type) decFn[T] {`
`1703`		`- return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)`
	`1703`	`+ return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)`
`1704`	`1704`	`}`
`1705`	`1705`
`1706`	`1706`	`// ----`
Original file line number	Diff line number	Diff line change
`@@ -1296,11 +1296,11 @@ func (e *encoder[T]) rawBytes(vv Raw) {`
`1296`	`1296`	`}`
`1297`	`1297`
`1298`	`1298`	`func (e encoder[T]) fn(t reflect.Type) encFn[T] {`
`1299`		`- return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)`
	`1299`	`+ return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)`
`1300`	`1300`	`}`
`1301`	`1301`
`1302`	`1302`	`func (e encoder[T]) fnNoExt(t reflect.Type) encFn[T] {`
`1303`		`- return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)`
	`1303`	`+ return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)`
`1304`	`1304`	`}`
`1305`	`1305`
`1306`	`1306`	`// ---- container tracker methods`
Original file line number	Diff line number	Diff line change
`@@ -1165,11 +1165,11 @@ func (e *encoderJsonBytes) rawBytes(vv Raw) {`
`1165`	`1165`	`}`
`1166`	`1166`
`1167`	`1167`	`func (e encoderJsonBytes) fn(t reflect.Type) encFnJsonBytes {`
`1168`		`- return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)`
	`1168`	`+ return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)`
`1169`	`1169`	`}`
`1170`	`1170`
`1171`	`1171`	`func (e encoderJsonBytes) fnNoExt(t reflect.Type) encFnJsonBytes {`
`1172`		`- return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)`
	`1172`	`+ return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)`
`1173`	`1173`	`}`
`1174`	`1174`
`1175`	`1175`	`func (e *encoderJsonBytes) mapStart(length int) {`
`@@ -1643,7 +1643,7 @@ func (d decoderJsonBytes) kInterfaceNaked(f decFnInfo) (rvn reflect.Value) {`
`1643`	`1643`	`} else {`
`1644`	`1644`	`rvn = reflect.New(bfn.rt)`
`1645`	`1645`	`if bfn.ext == SelfExt {`
`1646`		`- sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })`
	`1646`	`+ sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })`
`1647`	`1647`	`} else {`
`1648`	`1648`	`bfn.ext.ReadExt(rv2i(rvn), bytes)`
`1649`	`1649`	`}`
`@@ -2869,16 +2869,17 @@ func (d *decoderJsonBytes) interfaceExtConvertAndDecode(v interface{}, ext Inter`
`2869`	`2869`
`2870`	`2870`	`var vv interface{}`
`2871`	`2871`	`d.decode(&vv)`
	`2872`	`+`
`2872`	`2873`	`ext.UpdateExt(v, vv)`
`2873`	`2874`
`2874`	`2875`	`}`
`2875`	`2876`
`2876`	`2877`	`func (d decoderJsonBytes) fn(t reflect.Type) decFnJsonBytes {`
`2877`		`- return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)`
	`2878`	`+ return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)`
`2878`	`2879`	`}`
`2879`	`2880`
`2880`	`2881`	`func (d decoderJsonBytes) fnNoExt(t reflect.Type) decFnJsonBytes {`
`2881`		`- return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)`
	`2882`	`+ return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)`
`2882`	`2883`	`}`
`2883`	`2884`
`2884`	`2885`	`func (helperDecDriverJsonBytes) newDecoderBytes(in []byte, h Handle) *decoderJsonBytes {`
`@@ -5323,11 +5324,11 @@ func (e *encoderJsonIO) rawBytes(vv Raw) {`
`5323`	`5324`	`}`
`5324`	`5325`
`5325`	`5326`	`func (e encoderJsonIO) fn(t reflect.Type) encFnJsonIO {`
`5326`		`- return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, false)`
	`5327`	`+ return e.dh.encFnViaBH(t, e.rtidFn, e.h, e.fp, true)`
`5327`	`5328`	`}`
`5328`	`5329`
`5329`	`5330`	`func (e encoderJsonIO) fnNoExt(t reflect.Type) encFnJsonIO {`
`5330`		`- return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, true)`
	`5331`	`+ return e.dh.encFnViaBH(t, e.rtidFnNoExt, e.h, e.fp, false)`
`5331`	`5332`	`}`
`5332`	`5333`
`5333`	`5334`	`func (e *encoderJsonIO) mapStart(length int) {`
`@@ -5801,7 +5802,7 @@ func (d decoderJsonIO) kInterfaceNaked(f decFnInfo) (rvn reflect.Value) {`
`5801`	`5802`	`} else {`
`5802`	`5803`	`rvn = reflect.New(bfn.rt)`
`5803`	`5804`	`if bfn.ext == SelfExt {`
`5804`		`- sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, true) })`
	`5805`	`+ sideDecode(d.hh, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv2i(rvn), bytes, bfn.rt, false) })`
`5805`	`5806`	`} else {`
`5806`	`5807`	`bfn.ext.ReadExt(rv2i(rvn), bytes)`
`5807`	`5808`	`}`
`@@ -7027,16 +7028,17 @@ func (d *decoderJsonIO) interfaceExtConvertAndDecode(v interface{}, ext Interfac`
`7027`	`7028`
`7028`	`7029`	`var vv interface{}`
`7029`	`7030`	`d.decode(&vv)`
	`7031`	`+`
`7030`	`7032`	`ext.UpdateExt(v, vv)`
`7031`	`7033`
`7032`	`7034`	`}`
`7033`	`7035`
`7034`	`7036`	`func (d decoderJsonIO) fn(t reflect.Type) decFnJsonIO {`
`7035`		`- return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, false)`
	`7037`	`+ return d.dh.decFnViaBH(t, d.rtidFn, d.h, d.fp, true)`
`7036`	`7038`	`}`
`7037`	`7039`
`7038`	`7040`	`func (d decoderJsonIO) fnNoExt(t reflect.Type) decFnJsonIO {`
`7039`		`- return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, true)`
	`7041`	`+ return d.dh.decFnViaBH(t, d.rtidFnNoExt, d.h, d.fp, false)`
`7040`	`7042`	`}`
`7041`	`7043`
`7042`	`7044`	`func (helperDecDriverJsonIO) newDecoderBytes(in []byte, h Handle) *decoderJsonIO {`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ func (e *msgpackEncDriver[T]) EncodeExt(v interface{}, basetype reflect.Type, xt`
`157`	`157`	`if ext == SelfExt {`
`158`	`158`	`bs0 = e.e.blist.get(1024)`
`159`	`159`	`bs = bs0`
`160`		`- sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, true) })`
	`160`	`+ sideEncode(e.h, &e.h.sideEncPool, func(se encoderI) { oneOffEncode(se, v, &bs, basetype, false) })`
`161`	`161`	`} else {`
`162`	`162`	`bs = ext.WriteExt(v)`
`163`	`163`	`}`
`@@ -900,7 +900,7 @@ func (d *msgpackDecDriver[T]) DecodeExt(rv interface{}, basetype reflect.Type, x`
`900`	`900`	`return`
`901`	`901`	`}`
`902`	`902`	`if ext == SelfExt {`
`903`		`- sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, true) })`
	`903`	`+ sideDecode(d.h, &d.h.sideDecPool, func(sd decoderI) { oneOffDecode(sd, rv, xbs, basetype, false) })`
`904`	`904`	`} else {`
`905`	`905`	`ext.ReadExt(rv, xbs)`
`906`	`906`	`}`