[SCM] easytag/master: Apply Ubuntu patch from 2.1.7-1ubuntu2: fix out of bounds array access (Closes: #669290)

[lucidfox-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a487833d7f9ee3c6f316d13ec3f76314664e8849
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Thu May 10 21:26:41 2012 +0700

    Apply Ubuntu patch from 2.1.7-1ubuntu2: fix out of bounds array access (Closes: #669290)

diff --git a/debian/patches/fix-out-of-bound.patch b/debian/patches/fix-out-of-bound.patch
new file mode 100644
index 0000000..66bb651
--- /dev/null
+++ b/debian/patches/fix-out-of-bound.patch
@@ -0,0 +1,33 @@
+Description: fix out of bound array access
+ The list has 15 columns
+Author: Julian Taylor <jtaylor at ubuntu.com>
+Forwarded: easytag-mailing at lists.sourceforge.net
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/907806
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=669290
+---
+--- easytag-2.1.7.orig/src/misc.c
++++ easytag-2.1.7/src/misc.c
+@@ -2462,16 +2462,18 @@ void Search_File (GtkWidget *search_butt
+ 
+ void Add_Row_To_Search_Result_List(ET_File *ETFile,const gchar *string_to_search)
+ {
+-    gchar *SearchResultList_Text[14]; // Because : 14 columns to display
+-    gint SearchResultList_Weight[14] = {PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
++    gchar *SearchResultList_Text[15]; // Because : 15 columns to display
++    gint SearchResultList_Weight[15] = {PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                         PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                         PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                         PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                         PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+                                         PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
+-                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL};
+-    GdkColor *SearchResultList_Color[14] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+-                                            NULL, NULL, NULL, NULL, NULL, NULL, NULL};
++                                        PANGO_WEIGHT_NORMAL, PANGO_WEIGHT_NORMAL,
++                                        PANGO_WEIGHT_NORMAL};
++    GdkColor *SearchResultList_Color[15] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL,
++                                            NULL, NULL, NULL, NULL, NULL, NULL, NULL,
++                                            NULL};
+     gchar *track, *track_total;
+     gboolean case_sensitive;
+     gint column;
diff --git a/debian/patches/series b/debian/patches/series
index 84fc1cc..83134e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 desktop.patch
 taglib.patch
 fix_segfault_loading_tags_from_txt.patch
+fix-out-of-bound.patch

-- 
easytag packaging