fix unmarshaling null into []byte

fixes polydawn#40
Stebalien · Nov 1, 2018 · c6752ca · c6752ca
1 parent 10eebc3
commit c6752ca
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/obj/unmarshalBuiltins.go b/obj/unmarshalBuiltins.go
@@ -121,6 +121,9 @@ func (mach *unmarshalMachinePrimitive) Step(_ *Unmarshaller, _ *unmarshalSlab, t
 		case TBytes:
 			mach.rv.SetBytes(tok.Bytes)
 			return true, nil
+		case TNull:
+			mach.rv.SetBytes(nil)
+			return true, nil
 		default:
 			return true, ErrUnmarshalTypeCantFit{*tok, mach.rv, 0}
 		}
@@ -138,6 +141,12 @@ func (mach *unmarshalMachinePrimitive) Step(_ *Unmarshaller, _ *unmarshalSlab, t
 				mach.rv.Index(i).SetUint(uint64(tok.Bytes[i]))
 			}
 			return true, nil
+		case TNull:
+			if mach.rv.Len() != 0 {
+				return true, ErrUnmarshalTypeCantFit{*tok, mach.rv, 0}
+			}
+			mach.rv.SetBytes(nil)
+			return true, nil
 		default:
 			return true, ErrUnmarshalTypeCantFit{*tok, mach.rv, 0}
 		}