[oe-commits] org.oe.dreambox tuxbox-libtuxtxt: patch to prevent crash on invalid teletext data

[tmbinc commit]

tuxbox-libtuxtxt: patch to prevent crash on invalid teletext data

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 1ae71587ffbcdba31dd8e559495278cf438bcb88
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1ae71587ffbcdba31dd8e559495278cf438bcb88
Files:
1
packages/tuxbox/tuxbox-libtuxtxt
packages/tuxbox/tuxbox-libtuxtxt/libtuxtxt_bugfix.patch
packages/tuxbox/tuxbox-libtuxtxt.bb
mtn:execute
true
Diffs:

#
# mt diff -r7e2d6226e4a7e50f37df248741ba58036f3467a3 -r1ae71587ffbcdba31dd8e559495278cf438bcb88
#
# 
# 
# add_dir "packages/tuxbox/tuxbox-libtuxtxt"
# 
# add_file "packages/tuxbox/tuxbox-libtuxtxt/libtuxtxt_bugfix.patch"
#  content [b365957aec923a6e735e5c39e664af4f90a8b4fa]
# 
# patch "packages/tuxbox/tuxbox-libtuxtxt.bb"
#  from [cf405f9fbe9a1c9e0c4273d7b44be374e0df83ac]
#    to [bbae0d33566ba59be4d1fbd2871c437bbea4960f]
# 
#   set "packages/tuxbox/tuxbox-libtuxtxt/libtuxtxt_bugfix.patch"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- packages/tuxbox/tuxbox-libtuxtxt/libtuxtxt_bugfix.patch	b365957aec923a6e735e5c39e664af4f90a8b4fa
+++ packages/tuxbox/tuxbox-libtuxtxt/libtuxtxt_bugfix.patch	b365957aec923a6e735e5c39e664af4f90a8b4fa
@@ -0,0 +1,15 @@
+diff -Naur libs/libtuxtxt/tuxtxt_common.h libs_patched/libtuxtxt/tuxtxt_common.h
+--- libs_org/libtuxtxt/tuxtxt_common.h	2005-09-11 15:34:56.000000000 +0200
++++ libs/libtuxtxt/tuxtxt_common.h	2006-10-04 11:41:01.000000000 +0200
+@@ -888,6 +888,11 @@
+ 								p->subpage = d2 >> 2;
+ 								if ((p->page & 0xff) == 0xff)
+ 									p->page = 0;
++								else if (p->page > 0x899)
++								{
++									printf("[TuxTxt] page > 0x899 ... ignore!!!!!!\n");
++									continue;
++								}
+ 								else if (tuxtxt_cache.astCachetable[p->page][0])	/* link valid && linked page cached */
+ 								{
+ 									tstPageinfo *pageinfo_link = &(tuxtxt_cache.astCachetable[p->page][0]->pageinfo);
============================================================
--- packages/tuxbox/tuxbox-libtuxtxt.bb	cf405f9fbe9a1c9e0c4273d7b44be374e0df83ac
+++ packages/tuxbox/tuxbox-libtuxtxt.bb	bbae0d33566ba59be4d1fbd2871c437bbea4960f
@@ -1,15 +1,18 @@ SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/
 DESCRIPTION = "tuxbox libtuxtxt"
 DEPENDS = "dreambox-dvbincludes"
 MAINTAINER = "Felix Domke <tmbinc at elitdvb.net>"
 SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/libs;method=ext \
            file://acinclude.m4"
 
+SRC_URI_append_dm7025 = " file://libtuxtxt_bugfix.patch;patch=1"
+
 SRCDATE_dm600pvr = "20060301"
 SRCDATE_dm7025 = "20050912"
 SRCDATE_dm7020 = "20060301"
 
 PN = "libtuxtxt"
-PR = "r0"
+PR = "r1"
+
 PV = "0.0+cvs${SRCDATE}"
 S = "${WORKDIR}/libs"
 EXTRA_OECONF = "--with-target=native"