Merge pull request #381 from niallnsec/master

Copy byte array when unmarshalling RawMessage
mailru · Dec 14, 2024 · d48874a · d48874a
2 parents 141f9c7 + 34d2f3a
commit d48874a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
@@ -187,7 +187,10 @@ func (g *Generator) Run() error {
 		buildFlags := buildFlagsRegexp.FindAllString(g.GenBuildFlags, -1)
 		execArgs = append(execArgs, buildFlags...)
 	}
-	execArgs = append(execArgs, "-tags", g.BuildTags, filepath.Base(path))
+	if len(g.BuildTags) > 0 {
+		execArgs = append(execArgs, "-tags", g.BuildTags)
+	}
+	execArgs = append(execArgs, filepath.Base(path))
 	cmd := exec.Command("go", execArgs...)
 
 	cmd.Stdout = f

diff --git a/raw.go b/raw.go
@@ -25,7 +25,8 @@ func (v *RawMessage) UnmarshalEasyJSON(l *jlexer.Lexer) {
 
 // UnmarshalJSON implements encoding/json.Unmarshaler interface.
 func (v *RawMessage) UnmarshalJSON(data []byte) error {
-	*v = data
+	*v = make([]byte, len(data))
+	copy(*v, data)
 	return nil
 }