diff -Nru librcc-0.2.9/debian/changelog librcc-0.2.9/debian/changelog --- librcc-0.2.9/debian/changelog 2013-11-02 00:42:48.000000000 +0100 +++ librcc-0.2.9/debian/changelog 2013-11-18 11:38:36.000000000 +0100 @@ -1,3 +1,10 @@ +librcc (0.2.9-3.1ubuntu0.1) saucy-proposed; urgency=low + + * debian/patches/fix-segfault.patch: (LP: #1183580) + - Add patch from upstream to fix a segfault in rccGetDefaultLanguage + + -- Andreas Moog Sun, 17 Nov 2013 12:04:59 +0100 + librcc (0.2.9-3.1build1) trusty; urgency=low * No change rebuild against db 5.3. diff -Nru librcc-0.2.9/debian/patches/fix-segfault.patch librcc-0.2.9/debian/patches/fix-segfault.patch --- librcc-0.2.9/debian/patches/fix-segfault.patch 1970-01-01 01:00:00.000000000 +0100 +++ librcc-0.2.9/debian/patches/fix-segfault.patch 2013-11-17 12:29:48.000000000 +0100 @@ -0,0 +1,28 @@ +Description: Fix a segfault in rccGetDefaultLanguage +Origin: Upstream +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1183580 + +--- librcc-0.2.9.orig/src/librcc.c 2009-08-27 21:57:37.000000000 +0200 ++++ librcc-0.2.12/src/librcc.c 2013-04-24 01:25:31.000000000 +0200 +@@ -401,8 +406,8 @@ + if ((i==1)&&(!language->charsets[1])&&(rccIsUTF8(language->charsets[0]))) + ctx->ilang[ctx->n_languages].latin = 1; + +- ctx->languages[ctx->n_languages++] = (rcc_language_ptr)(ctx->ilang + ctx->n_languages); +- ctx->languages[ctx->n_languages] = NULL; ++ ctx->languages[ctx->n_languages] = (rcc_language_ptr)(ctx->ilang + ctx->n_languages); ++ ctx->languages[++ctx->n_languages] = NULL; + + if (!ctx->current_language) + ctx->current_config = rccGetCurrentConfig(ctx); +@@ -508,8 +513,8 @@ + ctx->iclass[ctx->n_classes].disabled = NULL; + ctx->iclass[ctx->n_classes].additional = NULL; + +- ctx->classes[ctx->n_classes++] = (rcc_class_ptr)(ctx->iclass + ctx->n_classes); +- ctx->classes[ctx->n_classes] = NULL; ++ ctx->classes[ctx->n_classes] = (rcc_class_ptr)(ctx->iclass + ctx->n_classes); ++ ctx->classes[++ctx->n_classes] = NULL; + + if (!strcasecmp(cl->name, "id3")) { + rccRegisterDisabledCharsets(ctx, ctx->n_classes - 1, rcc_default_disabled_id3_charsets); diff -Nru librcc-0.2.9/debian/patches/series librcc-0.2.9/debian/patches/series --- librcc-0.2.9/debian/patches/series 2013-05-18 18:49:23.000000000 +0200 +++ librcc-0.2.9/debian/patches/series 2013-11-17 12:23:51.000000000 +0100 @@ -1 +1,2 @@ glib-single-include.patch +fix-segfault.patch