Bug#708247: pu: package smcroute/0.95-1+deb7u1

[Micha Lenk <micha@debian.org>]

Control: retitle -1 pu: package smcroute/0.95-1+deb7u1

Hi KiBi,

Am 21.05.2013 23:57, schrieb Cyril Brulebois:
> I'd suggest:
>  - upload 0.95-2 to unstable right away, with 3.0 (quilt) if you like.
>  - wait a few days to make sure no regressions are reported.
>  - propose a 0.95-1+deb7u1 debdiff with the patch applied directly
>    (without the format change); since it shouldn't be much of a change
>    apart from the version string, it should be quick to review. ;)

As suggested, I am hereby suggesting the attached debdiff output for
releasing smcroute 0.95-1+deb7u1 in the next point release of wheezy.
Thanks for considering.

Cheers,
Micha

diff -u smcroute-0.95/debian/changelog smcroute-0.95/debian/changelog
--- smcroute-0.95/debian/changelog
+++ smcroute-0.95/debian/changelog
@@ -1,3 +1,10 @@
+smcroute (0.95-1+deb7u1) stable; urgency=low
+
+  * Fix a NULL pointer dereferencing in interface vector initialization
+    (closes: #707793, LP: #1043688).
+
+ -- Micha Lenk <micha@debian.org>  Mon, 27 May 2013 21:22:39 +0200
+
 smcroute (0.95-1) unstable; urgency=low
 
   * New upstream version, added support for FreeBSD
only in patch2:
unchanged:
--- smcroute-0.95.orig/src/ifvc.c
+++ smcroute-0.95/src/ifvc.c
@@ -50,12 +50,13 @@
   }
 
   for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
+    /* Skip interface without internet address */
+    if (ifa->ifa_addr == NULL) continue;
+
     int family = ifa->ifa_addr->sa_family;
 
     /* Skip non-IPv4 and non-IPv6 interfaces */
     if ((family != AF_INET) && (family != AF_INET6)) continue;
-    /* Skip interface without internet address */
-    if (ifa->ifa_addr == NULL) continue;
 
     /* Copy data from interface iterator 'ifa' */
     strncpy(IfDescEp->Name, ifa->ifa_name, sizeof(IfDescEp->Name));