diff -Nru qt4-x11-4.8.0/debian/changelog qt4-x11-4.8.0/debian/changelog --- qt4-x11-4.8.0/debian/changelog 2012-03-09 17:09:20.000000000 +0000 +++ qt4-x11-4.8.0/debian/changelog 2012-03-12 11:10:48.000000000 +0000 @@ -1,3 +1,10 @@ +qt4-x11 (4:4.8.0-1ubuntu10) precise; urgency=low + + * Add kubuntu_32_oriental_character_crash.diff from upstream, fix + crash in oriental characters + + -- Jonathan Riddell Mon, 12 Mar 2012 11:10:48 +0000 + qt4-x11 (4:4.8.0-1ubuntu9) precise; urgency=low * "update kubuntu_31_unity_workarea_atom.diff to notify of diff -Nru qt4-x11-4.8.0/debian/patches/kubuntu_32_oriental_character_crash.diff qt4-x11-4.8.0/debian/patches/kubuntu_32_oriental_character_crash.diff --- qt4-x11-4.8.0/debian/patches/kubuntu_32_oriental_character_crash.diff 1970-01-01 00:00:00.000000000 +0000 +++ qt4-x11-4.8.0/debian/patches/kubuntu_32_oriental_character_crash.diff 2012-03-12 11:11:41.000000000 +0000 @@ -0,0 +1,30 @@ +From 9ae6f2f9a57f0c3096d5785913e437953fa6775c Mon Sep 17 00:00:00 2001 +From: Jiang Jiang +Date: Mon, 18 Jul 2011 08:49:32 +0200 +Subject: [PATCH] Check for buffer overflow in Lookup_MarkMarkPos + +That may cause crash in this function with certain fonts. + +Task-number: QTBUG-17238 +Done-by: Alberto Garcia +Reviewed-by: Jiang Jiang +http://qt.gitorious.org/qt/qt/commit/9ae6f2f9a57f0c3096d5785913e437953fa6775c +https://bugreports.qt-project.org/browse/QTBUG-17238 +--- + src/3rdparty/harfbuzz/src/harfbuzz-gpos.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +Index: qt4-x11-4.8.0/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c +=================================================================== +--- qt4-x11-4.8.0.orig/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c 2011-12-08 05:06:02.000000000 +0000 ++++ qt4-x11-4.8.0/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c 2012-03-12 11:11:37.681652621 +0000 +@@ -3015,6 +3015,9 @@ + if ( i > buffer->in_pos ) + return HB_Err_Not_Covered; + ++ if ( i > buffer->in_pos ) ++ return HB_Err_Not_Covered; ++ + error = _HB_OPEN_Coverage_Index( &mmp->Mark2Coverage, IN_GLYPH( j ), + &mark2_index ); + if ( error ) diff -Nru qt4-x11-4.8.0/debian/patches/series qt4-x11-4.8.0/debian/patches/series --- qt4-x11-4.8.0/debian/patches/series 2012-03-09 17:05:03.000000000 +0000 +++ qt4-x11-4.8.0/debian/patches/series 2012-03-12 11:10:34.000000000 +0000 @@ -56,3 +56,4 @@ kubuntu_95_qt_disable_bounce.diff kubuntu_97_a11y_qt_and_qml_backport.diff kubuntu_31_unity_workarea_atom.diff +kubuntu_32_oriental_character_crash.diff