r35468 - in /desktop/experimental/glib2.0/debian: changelog patches/07_contenttype_test_fix_overflow.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Jun 27 08:39:45 2012
New Revision: 35468

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35468
Log:
Add 07_contenttype_test_fix_overflow.patch: Call g_content_type_guess()
with valid data len. Fixes a segfault when running the test.
Forwarded to GNOME #674452.

Added:
    desktop/experimental/glib2.0/debian/patches/07_contenttype_test_fix_overflow.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=35468&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Wed Jun 27 08:39:45 2012
@@ -2,6 +2,9 @@
 
   * Rename 07_socket_test_timespan_jitter.patch to 00git_* and update
     changelog with what got committed upstream.
+  * Add 07_contenttype_test_fix_overflow.patch: Call g_content_type_guess()
+    with valid data len. Fixes a segfault when running the test.
+    Forwarded to GNOME #674452.
 
  -- Martin Pitt <mpitt at debian.org>  Wed, 27 Jun 2012 10:37:07 +0200
 

Added: desktop/experimental/glib2.0/debian/patches/07_contenttype_test_fix_overflow.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/07_contenttype_test_fix_overflow.patch?rev=35468&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_contenttype_test_fix_overflow.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/07_contenttype_test_fix_overflow.patch [utf-8] Wed Jun 27 08:39:45 2012
@@ -1,0 +1,38 @@
+From 6c39859ddcc94b311c653dee42d32d2412a6f406 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt at gnome.org>
+Date: Wed, 27 Jun 2012 09:25:37 +0200
+Subject: [PATCH] gio/tests/contenttype: Call g_content_type_guess() with
+ valid data len
+
+g_content_type_guess() requires specifying a valid data length. Fixes a
+segfault when running the test.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=674452
+---
+ gio/tests/contenttype.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gio/tests/contenttype.c b/gio/tests/contenttype.c
+index 7188894..9e0f9af 100644
+--- a/gio/tests/contenttype.c
++++ b/gio/tests/contenttype.c
+@@ -55,14 +55,14 @@ test_guess (void)
+   g_free (res);
+   g_free (expected);
+ 
+-  res = g_content_type_guess ("test.pot", (guchar *)"ABC abc", -1, &uncertain);
++  res = g_content_type_guess ("test.pot", (guchar *)"ABC abc", 7, &uncertain);
+   expected = g_content_type_from_mime_type ("application/vnd.ms-powerpoint");
+   g_assert (g_content_type_equals (expected, res));
+   g_assert (uncertain);
+   g_free (res);
+   g_free (expected);
+ 
+-  res = g_content_type_guess ("test.otf", (guchar *)"OTTO", -1, &uncertain);
++  res = g_content_type_guess ("test.otf", (guchar *)"OTTO", 4, &uncertain);
+   expected = g_content_type_from_mime_type ("application/x-font-otf");
+   g_assert (g_content_type_equals (expected, res));
+   g_assert (!uncertain);
+-- 
+1.7.10.4
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35468&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Wed Jun 27 08:39:45 2012
@@ -4,6 +4,7 @@
 04_homedir_env.patch
 05_run-gio-tests-with-a-dbus-session.patch
 06_thread_test_ignore_prctl_fail.patch
+07_contenttype_test_fix_overflow.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 91_revert_schema_path_warning.patch