dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

dissect-image: handle 'continue' event in metadata acquisition uniformly

Browse Source 
Let's jump to the same label in all cases, that closes the associated
pipe, systematically.
This commit is contained in:
Lennart Poettering
2023-12-04 18:19:27 +01:00
parent 3ee413e632
commit 29b4db7ede
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/shared/dissect-image.c
View File

@@ -3494,7 +3494,7 @@ int dissected_image_acquire_metadata(DissectedImage *m, DissectImageFlags extra_
if (r < 0)
goto inner_fail;
continue;
goto next;
}
default:
@@ -3507,14 +3507,14 @@ int dissected_image_acquire_metadata(DissectedImage *m, DissectImageFlags extra_
if (fd < 0) {
log_debug_errno(fd, "Failed to read %s file of image, ignoring: %m", paths[k]);
fds[2*k+1] = safe_close(fds[2*k+1]);
continue;
goto next;
}
r = copy_bytes(fd, fds[2*k+1], UINT64_MAX, 0);
if (r < 0)
goto inner_fail;
next:
fds[2*k+1] = safe_close(fds[2*k+1]);
}