diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2004-08-20 20:59:41 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2004-08-20 20:59:41 +0000 |
| commit | dfeb260b6a2eec034d1b0c869c7866c918c21fef (patch) | |
| tree | 3fcac3f7b1d95040c57727131d9097afc77cb9b6 /app-text/wdiff/files | |
| parent | stable on ppc64, bug #58503 (Manifest recommit) (diff) | |
| download | gentoo-2-dfeb260b6a2eec034d1b0c869c7866c918c21fef.tar.gz gentoo-2-dfeb260b6a2eec034d1b0c869c7866c918c21fef.tar.bz2 gentoo-2-dfeb260b6a2eec034d1b0c869c7866c918c21fef.zip | |
Add a patch to fix the segfaulting when wdiff is run as a user. Problem reported and fixed by: Mikko Ruuska <mikko.ruuska@solidtech.com> in bug #60543
Diffstat (limited to 'app-text/wdiff/files')
| -rw-r--r-- | app-text/wdiff/files/digest-wdiff-0.5-r1 | 2 | ||||
| -rw-r--r-- | app-text/wdiff/files/wdiff-0.5-segfault-fix.diff | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/app-text/wdiff/files/digest-wdiff-0.5-r1 b/app-text/wdiff/files/digest-wdiff-0.5-r1 new file mode 100644 index 000000000000..492c83e04f6c --- /dev/null +++ b/app-text/wdiff/files/digest-wdiff-0.5-r1 @@ -0,0 +1,2 @@ +MD5 7f9c78f5dd6fb4f3dabe28fbd4d14319 wdiff-0.5.tar.gz 129267 +MD5 9a919e76ca95db105427d827ed1a4c31 wdiff-0.5-gentoo.diff.bz2 253 diff --git a/app-text/wdiff/files/wdiff-0.5-segfault-fix.diff b/app-text/wdiff/files/wdiff-0.5-segfault-fix.diff new file mode 100644 index 000000000000..d0e837993b10 --- /dev/null +++ b/app-text/wdiff/files/wdiff-0.5-segfault-fix.diff @@ -0,0 +1,20 @@ +--- wdiff.c 2004-08-16 14:21:05.000000000 +0300 ++++ wdiff.c.fixed 2004-08-16 14:22:06.000000000 +0300 +@@ -910,7 +910,8 @@ + static void + complete_input_program (void) + { +- fclose (input_file); ++ if (input_file != NULL) ++ fclose (input_file); + wait (NULL); + } + +@@ -1303,6 +1304,7 @@ + initialize_strings (); + reformat_diff_output (); + fclose (input_file); ++ input_file = NULL; + } + + /* Clean up. Beware that input_file and output_file might not exist, |