Merge pull request #4754 from thaJeztah/1.4_restore_nil_pointer

estesp · web-flow · commit 31bbc1f7d423 · 2020-11-18T21:30:46.000-05:00
[release/1.4 backport] bug fix:#3448: invalid use of nil pointer in container restoring
diff --git a/container_restore_opts.go b/container_restore_opts.go
@@ -87,21 +87,21 @@ func WithRestoreRuntime(ctx context.Context, id string, client *Client, checkpoi
 				return err
 			}
 		}
-		var options *ptypes.Any
+		var options ptypes.Any
 		if m != nil {
 			store := client.ContentStore()
 			data, err := content.ReadBlob(ctx, store, *m)
 			if err != nil {
 				return errors.Wrap(err, "unable to read checkpoint runtime")
 			}
-			if err := proto.Unmarshal(data, options); err != nil {
+			if err := proto.Unmarshal(data, &options); err != nil {
 				return err
 			}
 		}
 
 		c.Runtime = containers.RuntimeInfo{
 			Name:    name,
-			Options: options,
+			Options: &options,
 		}
 		return nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -87,21 +87,21 @@ func WithRestoreRuntime(ctx context.Context, id string, client *Client, checkpoi`
`87`	`87`	`return err`
`88`	`88`	`}`
`89`	`89`	`}`
`90`		`- var options *ptypes.Any`
	`90`	`+ var options ptypes.Any`
`91`	`91`	`if m != nil {`
`92`	`92`	`store := client.ContentStore()`
`93`	`93`	`data, err := content.ReadBlob(ctx, store, *m)`
`94`	`94`	`if err != nil {`
`95`	`95`	`return errors.Wrap(err, "unable to read checkpoint runtime")`
`96`	`96`	`}`
`97`		`- if err := proto.Unmarshal(data, options); err != nil {`
	`97`	`+ if err := proto.Unmarshal(data, &options); err != nil {`
`98`	`98`	`return err`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`c.Runtime = containers.RuntimeInfo{`
`103`	`103`	`Name: name,`
`104`		`- Options: options,`
	`104`	`+ Options: &options,`
`105`	`105`	`}`
`106`	`106`	`return nil`
`107`	`107`	`}`