tag 591525 +patch thanks On Tue, Aug 03, 2010 at 08:31:29PM +0200, Josef Spillner wrote:
> Tags: upstream > > It is easily possible to crash mplayer through specially-crafted > playlist files. Instead of crashing, the application should return > with a proper exit code. Confirmed, reproduced and addressed. Reinhard, can you take care to apply the attached patch and forward it to upstream? HTH -- mail: a...@thur.de http://adi.thur.de PGP/GPG: key via keyserver
diff --git a/debian/patches/25playlist.patch b/debian/patches/25playlist.patch new file mode 100644 index 0000000..49b0453 --- /dev/null +++ b/debian/patches/25playlist.patch @@ -0,0 +1,19 @@ +From: Adrian Knoth <a...@drcomp.erfurt.thur.de> +Bug-Debian: http://bugs.debian.org/591525 +Description: Fix segfault on empty playlist +--- a/playtree.c ++++ b/playtree.c +@@ -206,6 +206,13 @@ play_tree_set_child(play_tree_t* pt, play_tree_t* child) { + assert(pt->entry_type == PLAY_TREE_ENTRY_NODE); + #endif + ++ /* Roughly validate input data. Both, pt and child are going to be ++ * dereferenced, hence assure they're not NULL. ++ */ ++ if (NULL == pt || NULL == child) { ++ return; ++ } ++ + //DEBUG_FF: Where are the children freed? + // Attention in using this function! + for(iter = pt->child ; iter != NULL ; iter = iter->next) diff --git a/debian/patches/series b/debian/patches/series index d0400e9..79e9876 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 22disable-xscreensaver.patch 23mplayer-debug-printf.patch 24forgotten-bgr15-format.patch +25playlist.patch
