[SCM] vlc/natty: ASX: fix NULL derefence

[bdrung at users.alioth.debian.org]

The following commit has been merged in the natty branch:
commit 51ed4b16cc2325e07b3a787b6fdbcfcaeebf1d2c
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Jun 14 01:00:58 2011 +0200

    ASX: fix NULL derefence
    
    LP: #785979

diff --git a/debian/patches/backport-fix-NULL-derefence.patch b/debian/patches/backport-fix-NULL-derefence.patch
new file mode 100644
index 0000000..6f5f1be
--- /dev/null
+++ b/debian/patches/backport-fix-NULL-derefence.patch
@@ -0,0 +1,37 @@
+From: Rémi Denis-Courmont <remi at remlab.net>
+Subject: ASX: fix NULL derefence
+Applied-Upstream: 1.1.10
+Origin: upstream, http://git.videolan.org/?p=vlc%2Fvlc-1.1.git;h=6849c233ac434403909da29e0861875abebcc718
+Bug-Ubuntu: https://launchpad.net/bugs/785979
+
+--- a/modules/demux/playlist/asx.c
++++ b/modules/demux/playlist/asx.c
+@@ -439,11 +439,15 @@
+                     }
+                     else continue;
+                 }
+-                if( ( psz_parse = strcasestr( psz_parse, "/>" ) ) )
+-                    psz_parse += 2;
+-                else if( ( psz_parse = strcasestr( psz_parse, "</MoreInfo>") ) )
+-                    psz_parse += 11;
+-                else continue;
++                if( ( psz_backup = strcasestr( psz_parse, "/>" ) ) )
++                    psz_parse = psz_backup + 2;
++                else if( ( psz_backup = strcasestr( psz_parse, "</MoreInfo>") ) )
++                    psz_parse = psz_backup + 11;
++                else
++                {
++                    psz_parse = NULL;
++                    continue;
++                }
+             }
+             else if( !strncasecmp( psz_parse, "<ABSTRACT>", 10 ) )
+             {
+@@ -483,7 +487,6 @@
+                 }
+                 if( ( psz_parse = strcasestr( psz_parse, "/>" ) ) )
+                     psz_parse += 2;
+-                else continue;
+             }
+             else if( !strncasecmp( psz_parse, "</Entry>", 8 ) )
+             {
diff --git a/debian/patches/series b/debian/patches/series
index 216da59..626182b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 xulrunner-1.9.1.patch
 fix-xspf-integer-overflow.patch
 backport-pulse-rewrite.patch
+backport-fix-NULL-derefence.patch

-- 
VLC media player packaging