* [PATCH v1] convert: fix return value for apply_multi_file_filter() on SIGPIPE
@ 2017-04-10 20:30 Lars Schneider
0 siblings, 0 replies; only message in thread
From: Lars Schneider @ 2017-04-10 20:30 UTC (permalink / raw)
To: git; +Cc: gitster, benpeart
If a pipe write fails and errno is set to EPIPE then we execute the
"error" path. However, as "err" can still be 0 the return value of
apply_multi_file_filter() would indicate success.
Fix this by setting "err" to the value of "errno" in case of a pipe
write failure.
Noticed-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
Notes:
Base Ref: master
Web-Diff: https://github.com/larsxschneider/git/commit/41a217c246
Checkout: git fetch https://github.com/larsxschneider/git errno-check-v1 && git checkout 41a217c246
convert.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/convert.c b/convert.c
index 8d652bf27c..586e0cdd45 100644
--- a/convert.c
+++ b/convert.c
@@ -753,6 +753,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
sigchain_pop(SIGPIPE);
if (err || errno == EPIPE) {
+ err = err ? err : errno;
if (!strcmp(filter_status.buf, "error")) {
/* The filter signaled a problem with the file. */
} else if (!strcmp(filter_status.buf, "abort")) {
base-commit: b14f27f91770e0f99f64135348977a0ce1c7993a
--
2.12.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-04-10 20:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-10 20:30 [PATCH v1] convert: fix return value for apply_multi_file_filter() on SIGPIPE Lars Schneider
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).