mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2193 from milkwine/fix-readSync

Browse Source 
fix readSync
This commit is contained in:
Mrunal Patel
2020-03-24 14:29:42 -07:00
committed by GitHub
parent a7ee31fa18 34d471769b
commit be51398a8a
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/sync.go
+11 -10
View File
@@ -47,20 +47,21 @@ func readSync(pipe io.Reader, expected syncType) error {
if err == io.EOF {
return fmt.Errorf("parent closed synchronisation channel")
}
return fmt.Errorf("failed reading error from parent: %v", err)
}
if procSync.Type == procError {
var ierr genericError
if procSync.Type == procError {
var ierr genericError
if err := json.NewDecoder(pipe).Decode(&ierr); err != nil {
return fmt.Errorf("failed reading error from parent: %v", err)
}
return &ierr
if err := json.NewDecoder(pipe).Decode(&ierr); err != nil {
return fmt.Errorf("failed reading error from parent: %v", err)
}
if procSync.Type != expected {
return fmt.Errorf("invalid synchronisation flag from parent")
}
return &ierr
}
if procSync.Type != expected {
return fmt.Errorf("invalid synchronisation flag from parent")
}
return nil
}