# HG changeset patch # User ib # Date 1353338856 0 # Node ID 5fbd422b355e47be0550e0aa532646f07efc3538 # Parent e625619bb20a163e31f0edecf01f90741cc0a300 Fix segmentation fault after end of file playback. At this point (GUI_END_FILE), mpctx's sh_video has already been freed and thus guiInfo.sh_video->codec->name mustn't be accessed which may happen as a result of the following uiEventHandling() call. Patch by Hans-Dieter Kosch, hdkosch kabelbw de. (Although the Win32 GUI isn't affected, because there is no use of guiInfo.sh_video->codec->name, it is patched accordingly for the sake of consistency. At least, it won't be showing the old codec name then, when there already is none.) diff -r e625619bb20a -r 5fbd422b355e gui/interface.c --- a/gui/interface.c Mon Nov 19 09:56:50 2012 +0000 +++ b/gui/interface.c Mon Nov 19 15:27:36 2012 +0000 @@ -761,9 +761,9 @@ case GUI_END_FILE: - uiEventHandling(ivRedraw, 1); + guiInfo.sh_video = NULL; - guiInfo.sh_video = NULL; + uiEventHandling(ivRedraw, 1); if (!uiGotoTheNext && guiInfo.Playing) { uiGotoTheNext = 1; diff -r e625619bb20a -r 5fbd422b355e gui/win32/interface.c --- a/gui/win32/interface.c Mon Nov 19 09:56:50 2012 +0000 +++ b/gui/win32/interface.c Mon Nov 19 15:27:36 2012 +0000 @@ -764,6 +764,8 @@ } case GUI_END_FILE: { + guiInfo.sh_video = NULL; + if(!uiGotoTheNext && guiInfo.Playing) { uiGotoTheNext = 1;