diff -Nru dvdauthor-0.6.11/debian/changelog dvdauthor-0.6.11/debian/changelog --- dvdauthor-0.6.11/debian/changelog 2006-11-18 15:26:15.000000000 +0200 +++ dvdauthor-0.6.11/debian/changelog 2006-11-18 15:26:15.000000000 +0200 @@ -1,3 +1,10 @@ +dvdauthor (0.6.11-5ubuntu1) feisty; urgency=low + + * Added ubuntu_01_segfault.diff for fixing segfault with certain + kind of xml files. closes malone #69151 + + -- ville palo Sat, 18 Nov 2006 15:10:00 +0200 + dvdauthor (0.6.11-5) unstable; urgency=low * Fix several memleaks (fixes by Ben Hutchings) diff -Nru dvdauthor-0.6.11/debian/patches/series dvdauthor-0.6.11/debian/patches/series --- dvdauthor-0.6.11/debian/patches/series 2006-11-18 15:26:15.000000000 +0200 +++ dvdauthor-0.6.11/debian/patches/series 2006-11-18 15:26:15.000000000 +0200 @@ -8,3 +8,4 @@ dvdauthor.c.diff memleak-dvdvob.diff memleak-xml.diff +ubuntu_01_segfault.diff diff -Nru dvdauthor-0.6.11/debian/patches/ubuntu_01_segfault.diff dvdauthor-0.6.11/debian/patches/ubuntu_01_segfault.diff --- dvdauthor-0.6.11/debian/patches/ubuntu_01_segfault.diff 1970-01-01 02:00:00.000000000 +0200 +++ dvdauthor-0.6.11/debian/patches/ubuntu_01_segfault.diff 2006-11-18 15:26:15.000000000 +0200 @@ -0,0 +1,25 @@ +--- dvdauthor-0.6.11/src/dvdvob.c.orig 2006-11-09 21:21:44.000000000 +0200 ++++ dvdauthor-0.6.11/src/dvdvob.c 2006-11-09 21:24:24.000000000 +0200 +@@ -1407,6 +1407,10 @@ + for( i=0; inumvobs; i++ ) { + int cellvobu=0; + int cellid=0; ++ if (!va->vobs[i]) ++ continue; ++ else if (!va->vobs[i]->vi) ++ continue; + va->vobs[i]->vi[0].vobcellid=1; + for( j=0; jvobs[i]->numvobus; j++ ) { + struct vobuinfo *v=&va->vobs[i]->vi[j]; +--- dvdauthor-0.6.11/src/dvdifo.c.orig 2006-11-09 21:21:13.000000000 +0200 ++++ dvdauthor-0.6.11/src/dvdifo.c 2006-11-09 21:19:24.000000000 +0200 +@@ -201,7 +201,8 @@ + write4(buf+p+4,c->vi[i].sector); + } + } +- write4(buf+p+8,c->vi[i-1].lastsector); ++ if (c->vi) ++ write4(buf+p+8,c->vi[i-1].lastsector); + p+=12; + } + write4(buf+4,p-1);