[pkg-boost-commits] r14763 - in boost/branches/1.49.0/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2013-05-14 04:23:34 +0000 (Tue, 14 May 2013)
New Revision: 14763

Added:
   boost/branches/1.49.0/debian/patches/boost_locale_utf.patch
Modified:
   boost/branches/1.49.0/debian/changelog
   boost/branches/1.49.0/debian/patches/series
Log:
Upload of NMU patch 3.2

Modified: boost/branches/1.49.0/debian/changelog
===================================================================
--- boost/branches/1.49.0/debian/changelog	2013-05-14 04:22:08 UTC (rev 14762)
+++ boost/branches/1.49.0/debian/changelog	2013-05-14 04:23:34 UTC (rev 14763)
@@ -1,3 +1,10 @@
+boost1.49 (1.49.0-3.2) unstable; urgency=high
+
+  * Non-maintainer upload by the Security Team..
+  * Fix UTF-8 validation issues (closes: #699649).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Mon, 04 Feb 2013 01:16:11 +0000
+
 boost1.49 (1.49.0-3.1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team.

Added: boost/branches/1.49.0/debian/patches/boost_locale_utf.patch
===================================================================
--- boost/branches/1.49.0/debian/patches/boost_locale_utf.patch	                        (rev 0)
+++ boost/branches/1.49.0/debian/patches/boost_locale_utf.patch	2013-05-14 04:23:34 UTC (rev 14763)
@@ -0,0 +1,48 @@
+--- a/boost/locale/utf.hpp	(revision 81589)
++++ b/boost/locale/utf.hpp	(revision 81590)
+@@ -219,16 +219,22 @@
+                 if(BOOST_LOCALE_UNLIKELY(p==e))
+                     return incomplete;
+                 tmp = *p++;
++                if (!is_trail(tmp))
++                    return illegal;
+                 c = (c << 6) | ( tmp & 0x3F);
+             case 2:
+                 if(BOOST_LOCALE_UNLIKELY(p==e))
+                     return incomplete;
+                 tmp = *p++;
++                if (!is_trail(tmp))
++                    return illegal;
+                 c = (c << 6) | ( tmp & 0x3F);
+             case 1:
+                 if(BOOST_LOCALE_UNLIKELY(p==e))
+                     return incomplete;
+                 tmp = *p++;
++                if (!is_trail(tmp))
++                    return illegal;
+                 c = (c << 6) | ( tmp & 0x3F);
+             }
+ 
+--- a/libs/locale/test/test_codepage_converter.cpp	(revision 81589)
++++ b/libs/locale/test/test_codepage_converter.cpp	(revision 81590)
+@@ -140,6 +140,20 @@
+         TEST_TO("\xf8\x90\x80\x80\x80",illegal);  // 400 0000
+         TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal);  // 7fff ffff
+ 
++        std::cout << "-- Invalid trail" << std::endl;
++        TEST_TO("\xC2\x7F",illegal);
++        TEST_TO("\xdf\x7F",illegal);
++        TEST_TO("\xe0\x7F\x80",illegal);
++        TEST_TO("\xef\xbf\x7F",illegal);
++        TEST_TO("\xe0\x7F\x80",illegal);
++        TEST_TO("\xef\xbf\x7F",illegal);
++        TEST_TO("\xf0\x7F\x80\x80",illegal);
++        TEST_TO("\xf4\x7f\xbf\xbf",illegal);
++        TEST_TO("\xf0\x90\x7F\x80",illegal);
++        TEST_TO("\xf4\x8f\x7F\xbf",illegal);
++        TEST_TO("\xf0\x90\x80\x7F",illegal);
++        TEST_TO("\xf4\x8f\xbf\x7F",illegal);
++
+         std::cout << "-- Invalid length" << std::endl;
+ 
+         /// Test that this actually works

Modified: boost/branches/1.49.0/debian/patches/series
===================================================================
--- boost/branches/1.49.0/debian/patches/series	2013-05-14 04:22:08 UTC (rev 14762)
+++ boost/branches/1.49.0/debian/patches/series	2013-05-14 04:23:34 UTC (rev 14763)
@@ -11,3 +11,4 @@
 gcc4.7_trac-6431.patch
 gcc4.7_trac-6331.patch
 CVE-2012-2677_trac-78326.patch
+boost_locale_utf.patch