[FFmpeg-cvslog] ffmpeg: dont call exit_program() from a signal hander
Michael Niedermayer
git at videolan.org
Sun Mar 23 21:12:14 CET 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 21 15:45:03 2014 +0100| [7c6a8afa7ea7fac599f81eb3c490e71e03944378] | committer: Michael Niedermayer
ffmpeg: dont call exit_program() from a signal hander
This is unsafe and can deadlock amongth other things
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 9dca02ee541120de2a96c387faed9a4e033a60fd)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c6a8afa7ea7fac599f81eb3c490e71e03944378
---
ffmpeg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 332a233..1d3cfd4 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -323,7 +323,7 @@ sigterm_handler(int sig)
received_nb_signals++;
term_exit();
if(received_nb_signals > 3)
- exit_program(123);
+ exit(123);
}
void term_init(void)
More information about the ffmpeg-cvslog
mailing list