On Tue, Aug 12, 2014 at 06:38:38PM +0200, René Scharfe wrote: > Am 11.08.2014 um 23:11 schrieb Stefan Beller: > >This was found by coverity. (Id: 290001) > > > >the variable 'output' is only assigned to a value inequal to NUL, > >after all gotos to the corrupt label. > >Therefore we can conclude the two removed lines are actually dead code. > > After reading the above for the first time I thought it meant the opposite > of what's actually going on. Perhaps it's the placement of "only", the > comma or a flawed understanding of grammar on my part? > > In any case, there is only one way to reach the label named corrupt, and the > variable named output is always NULL if that branch is taken. That means > the removed code was a no-op. With those two lines gone you also don't need > to initialize output anymore, by the way. > > And since there is only a single goto, you could move the three remaining > error handling lines up to the if statement. Keeping condition and > dependent code together would be an improvement, I think. I think that would be a correct refactoring of the current code, but I have to wonder why the other die cases are not using "goto corrupt" in the first place. The other thing this code path does is unlink the file "name". In the current code, this is _also_ a noop. We "goto corrupt" before we actually open the output file. So like the fclose(output), it is cleaning up an operation that was never started. It can just go away. But the bigger question is: should the other code paths be cleaning up the file? It probably doesn't matter, as mailsplit is typically run in a temporary directory in the first place, so it is up to the caller to clean up any half-formed cruft. And if we did want to clean up cruft, we should probably do it with an atexit/signal handler to catch more cases. Given that we are not cleaning up now and nobody has complained, I'd be inclined to say we should not. And the unlink can just go away, and all errors can just call die(). -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html