Omitempty on JSON decoder (#262)

* Update json-decode.go * Update json-decode.go Co-Authored-By: fedekunze <[email protected]>
tendermint · May 2, 2019 · fc5dc13 · fc5dc13
1 parent 87ef78b
commit fc5dc13
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/json-decode.go b/json-decode.go
@@ -396,8 +396,12 @@ func (cdc *Codec) decodeReflectJSONStruct(bz []byte, info *TypeInfo, rv reflect.
 			// but perhaps we are aiming for as much compatibility here.
 			// JAE: I vote we depart from encoding/json, than carry a vuln.
 
-			// Set nil/zero on frv.
-			frv.Set(reflect.Zero(frv.Type()))
+			// Set to the zero value only if not omitempty
+			if !field.JSONOmitEmpty {
+				// Set nil/zero on frv.
+				frv.Set(reflect.Zero(frv.Type()))
+			}
+
 			continue
 		}