Wed May 16 14:03:08 2012 UTC ()
Avoid a SIGSEGV, when AFPConfigInit() runs into a problem parsing
afpd.conf and returns NULL.


(hauke)
diff -r1.45 -r1.46 pkgsrc/net/netatalk/distinfo
diff -r0 -r1.1 pkgsrc/net/netatalk/patches/patch-etc_afpd_afp_config.c
cvs diff -r1.45 -r1.46 pkgsrc/net/netatalk/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/netatalk/Attic/distinfo 2012/05/12 21:53:20 1.45
+++ pkgsrc/net/netatalk/Attic/distinfo 2012/05/16 14:03:08 1.46
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1$NetBSD: distinfo,v 1.45 2012/05/12 21:53:20 dholland Exp $ 1$NetBSD: distinfo,v 1.46 2012/05/16 14:03:08 hauke Exp $
2 2
3SHA1 (netatalk-2.2.1.tar.bz2) = e588b89eced7769f65e213bc4b1b1e4f8035c8b3 3SHA1 (netatalk-2.2.1.tar.bz2) = e588b89eced7769f65e213bc4b1b1e4f8035c8b3
4RMD160 (netatalk-2.2.1.tar.bz2) = bc55a591fe134d3bf05ca442aa5b5246fd766b8c 4RMD160 (netatalk-2.2.1.tar.bz2) = bc55a591fe134d3bf05ca442aa5b5246fd766b8c
5Size (netatalk-2.2.1.tar.bz2) = 1227602 bytes 5Size (netatalk-2.2.1.tar.bz2) = 1227602 bytes
6SHA1 (patch-aa) = 060de5d023c3cc4e8d4e126270f2be69cf8a8913 6SHA1 (patch-aa) = 060de5d023c3cc4e8d4e126270f2be69cf8a8913
7SHA1 (patch-ac) = 605e87479202cbf093dfbadb25f2972595246d97 7SHA1 (patch-ac) = 605e87479202cbf093dfbadb25f2972595246d97
8SHA1 (patch-ae) = e114085fbe2abf2fb821f2d2737e877c53e7c151 8SHA1 (patch-ae) = e114085fbe2abf2fb821f2d2737e877c53e7c151
9SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2 9SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2
10SHA1 (patch-ah) = 505680d4085f5e40afb0554b5c748c1f6c68c367 10SHA1 (patch-ah) = 505680d4085f5e40afb0554b5c748c1f6c68c367
11SHA1 (patch-am) = a4e7fe53eb55ae17eb1888cfb278bc86d383f4fb 11SHA1 (patch-am) = a4e7fe53eb55ae17eb1888cfb278bc86d383f4fb
12SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4 12SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
13SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9 13SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9
14SHA1 (patch-ap) = c5e7cc0e1773d7e60106df7e1f3ded234308bb8c 14SHA1 (patch-ap) = c5e7cc0e1773d7e60106df7e1f3ded234308bb8c
15SHA1 (patch-aq) = 0793cf5ec158aa27c42b5d8a96651307d7c7c8b6 15SHA1 (patch-aq) = 0793cf5ec158aa27c42b5d8a96651307d7c7c8b6
16SHA1 (patch-ar) = 8c6c6169496b9b2cdec6049d2ee45884d5513d11 16SHA1 (patch-ar) = 8c6c6169496b9b2cdec6049d2ee45884d5513d11
17SHA1 (patch-au) = 8505351fee21ac1effa4dc620b8006c572b913c1 17SHA1 (patch-au) = 8505351fee21ac1effa4dc620b8006c572b913c1
18SHA1 (patch-bj) = abbc2809b6b7fe75ec2d2f8f2fa8d6cd9d6de7b0 18SHA1 (patch-bj) = abbc2809b6b7fe75ec2d2f8f2fa8d6cd9d6de7b0
19SHA1 (patch-bk) = c3fb7c3a42f148171fa99b6121b099dd4998947a 19SHA1 (patch-bk) = c3fb7c3a42f148171fa99b6121b099dd4998947a
 20SHA1 (patch-etc_afpd_afp_config.c) = 37813324c503fae05af12dba8dad5741a21ea4ed
20SHA1 (patch-etc_afpd_quota_c) = 5005abb6528c0b3160a587fbe9fb285f485e6759 21SHA1 (patch-etc_afpd_quota_c) = 5005abb6528c0b3160a587fbe9fb285f485e6759
21SHA1 (patch-macros_quota-check.m4) = b1484f83a2a6ba5bd50623ab525d5366bb71abaa 22SHA1 (patch-macros_quota-check.m4) = b1484f83a2a6ba5bd50623ab525d5366bb71abaa
File Added: pkgsrc/net/netatalk/patches/Attic/patch-etc_afpd_afp_config.c
$NetBSD: patch-etc_afpd_afp_config.c,v 1.1 2012/05/16 14:03:08 hauke Exp $

Avoid a SIGSEGV when AFPConfigInit() runs into a problem and returns NULL.

--- etc/afpd/afp_config.c.orig	2011-07-22 04:30:42.000000000 +0000
+++ etc/afpd/afp_config.c
@@ -591,7 +591,7 @@ AFPConfig *configinit(struct afp_options
         first = AFPConfigInit(cmdline, cmdline);
 
     /* Now register with zeroconf, we also need the volumes for that */
-    if (! (first->obj.options.flags & OPTION_NOZEROCONF)) {
+    if (first != NULL && ! (first->obj.options.flags & OPTION_NOZEROCONF)) {
         load_volumes(&first->obj);
         zeroconf_register(first);
     }