jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix readSync 

Signed-off-by: SiYu Zhao <d.chaser.zsy@gmail.com>
This commit is contained in:
SiYu Zhao 2020-03-17 11:26:46 +08:00
parent a88592a634
commit 34d471769b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libcontainer/sync.go
View File

@ -52,20 +52,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
}