package sound-juicer
tag 591621 + patch
tag 562558 + patch
thanks

The attached patch should solve both 591621 and 562558. It's probably a
bit workaround-ish, but the package right now is rather unusable. I
intend to NMU the patch with 14 days delay.

Thanks, Giovanni.
-- 
Giovanni Mascellani <[email protected]>
Pisa, Italy

Web: http://poisson.phc.unipi.it/~mascellani
Jabber: [email protected] / [email protected]
diff -u sound-juicer-2.28.2/debian/changelog sound-juicer-2.28.2/debian/changelog
--- sound-juicer-2.28.2/debian/changelog
+++ sound-juicer-2.28.2/debian/changelog
@@ -1,3 +1,12 @@
+sound-juicer (2.28.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix segmentation fault when changing artist field (closes: #591621).
+  * Fix segmentation fault when ripping with empty artist and the artist
+    name is used in the path (closes: #562558).
+
+ -- Giovanni Mascellani <[email protected]>  Wed, 04 Aug 2010 11:18:48 +0200
+
 sound-juicer (2.28.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
only in patch2:
unchanged:
--- sound-juicer-2.28.2.orig/src/sj-extracting.c
+++ sound-juicer-2.28.2/src/sj-extracting.c
@@ -856,6 +856,10 @@
   gchar *res = NULL;
   gchar *s;
 
+  if (str == NULL) {
+    str = g_strdup("");
+  }
+
   /* Skip leading periods, otherwise files disappear... */
   while (*str == '.')
     str++;
only in patch2:
unchanged:
--- sound-juicer-2.28.2.orig/src/sj-main.c
+++ sound-juicer-2.28.2/src/sj-main.c
@@ -1426,7 +1426,7 @@
   do {
     gtk_tree_model_get (GTK_TREE_MODEL (track_store), &iter, COLUMN_ARTIST, &current_track_artist, -1);
     /* Change track artist if it matched album artist before the change */
-    if ((strcasecmp (current_track_artist, former_album_artist) == 0) || (strcasecmp (current_track_artist, current_album->artist) == 0)) {
+    if (((former_album_artist != 0) && (strcasecmp (current_track_artist, former_album_artist) == 0)) || (strcasecmp (current_track_artist, current_album->artist) == 0)) {
       gtk_tree_model_get (GTK_TREE_MODEL (track_store), &iter, COLUMN_DETAILS, &track, -1);
 
       g_free (track->artist);

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to