CVS commit: pkgsrc/mail/srs-milter

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Thu Jun 13 15:22:14 UTC 2024

Modified Files:
        pkgsrc/mail/srs-milter: Makefile distinfo
        pkgsrc/mail/srs-milter/patches: patch-srs-filter.c

Log Message:
Bug fix: test srs_milter_connection_data is set before using it


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/srs-milter/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/srs-milter/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/srs-milter/patches/patch-srs-filter.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/srs-milter/Makefile
diff -u pkgsrc/mail/srs-milter/Makefile:1.2 pkgsrc/mail/srs-milter/Makefile:1.3
--- pkgsrc/mail/srs-milter/Makefile:1.2 Mon Jun 26 09:18:20 2023
+++ pkgsrc/mail/srs-milter/Makefile     Thu Jun 13 15:22:14 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2023/06/26 09:18:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2024/06/13 15:22:14 manu Exp $
 
 GITHUB_PROJECT=        srs-milter
 GITHUB_TAG=    3c44b13a10471df0361c08786c8826ea1d0ecc7b
 DISTNAME=      3c44b13a10471df0361c08786c8826ea1d0ecc7b
 PKGNAME=       ${GITHUB_PROJECT}-20141121
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=emsearcy/}
 DIST_SUBDIR=   ${GITHUB_PROJECT}

Index: pkgsrc/mail/srs-milter/distinfo
diff -u pkgsrc/mail/srs-milter/distinfo:1.1 pkgsrc/mail/srs-milter/distinfo:1.2
--- pkgsrc/mail/srs-milter/distinfo:1.1 Wed May 25 15:45:31 2022
+++ pkgsrc/mail/srs-milter/distinfo     Thu Jun 13 15:22:14 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2022/05/25 15:45:31 manu Exp $
+$NetBSD: distinfo,v 1.2 2024/06/13 15:22:14 manu Exp $
 
 BLAKE2s (srs-milter/3c44b13a10471df0361c08786c8826ea1d0ecc7b-3c44b13a10471df0361c08786c8826ea1d0ecc7b.zip) = e62ffea86976769bda9e0af3d64a52dd57901bf2130b7b8d39a7741d2731bfa0
 SHA512 (srs-milter/3c44b13a10471df0361c08786c8826ea1d0ecc7b-3c44b13a10471df0361c08786c8826ea1d0ecc7b.zip) = 
91db41b5fd955a1856ce1b30ec2ceaac2483820b3c1cc29e9817460633f3013401b416bb98e76fd5bf41492836b8dea42ea46689c4544d021a1d65f234c80112
 Size (srs-milter/3c44b13a10471df0361c08786c8826ea1d0ecc7b-3c44b13a10471df0361c08786c8826ea1d0ecc7b.zip) = 15843 bytes
-SHA1 (patch-srs-filter.c) = c3533bff78ecb36380d73a357b6ea6341d02550c
+SHA1 (patch-srs-filter.c) = bca45c18873469bdb8e1875b1c75ad0945774df9

Index: pkgsrc/mail/srs-milter/patches/patch-srs-filter.c
diff -u pkgsrc/mail/srs-milter/patches/patch-srs-filter.c:1.1 pkgsrc/mail/srs-milter/patches/patch-srs-filter.c:1.2
--- pkgsrc/mail/srs-milter/patches/patch-srs-filter.c:1.1       Wed May 25 15:45:32 2022
+++ pkgsrc/mail/srs-milter/patches/patch-srs-filter.c   Thu Jun 13 15:22:14 2024
@@ -1,13 +1,14 @@
-$NetBSD: patch-srs-filter.c,v 1.1 2022/05/25 15:45:32 manu Exp $
+$NetBSD: patch-srs-filter.c,v 1.2 2024/06/13 15:22:14 manu Exp $
 
 - Update pidfile after forking
 - Process addresses with or without enclosing brackets
 - Add -u/--user option to use unprivilegied user
 - Add -A/--alias-cmd and -R/--aliad_regex to resolve aliases
 - Add -n/--reverse-null to ensable SRS reverse for null sender <>
+- Bug fix: test srs_milter_connection_data is set before using it
 
---- srs-filter.c.orig  2022-05-11 14:10:11.430909881 +0200
-+++ srs-filter.c       2022-05-17 08:53:10.516904377 +0200
+--- srs-filter.c.orig
++++ srs-filter.c
 @@ -3,11 +3,13 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -190,6 +191,25 @@ $NetBSD: patch-srs-filter.c,v 1.1 2022/0
          if (!cd->recip[argc]) {
            // memory allocation problem
            cd->state |= SS_STATE_INVALID_MSG;
+@@ -600,15 +668,15 @@
+ xxfi_srs_milter_close(SMFICTX* ctx) {
+   struct srs_milter_connection_data* cd =
+           (struct srs_milter_connection_data*) smfi_getpriv(ctx);
+ 
++  if (!cd)
++    return SMFIS_CONTINUE;
++
+   if (CONFIG_verbose)
+     syslog(LOG_DEBUG, "conn# %d[%i] - xxfi_srs_milter_close()",
+            cd->num, cd->state);
+ 
+-  if (!cd)
+-    return SMFIS_CONTINUE;
+-
+   smfi_setpriv(ctx, NULL);
+ 
+   if (cd->sender)
+     free(cd->sender);
 @@ -669,8 +737,17 @@
      syslog(LOG_ERR, "exiting parent process");
      exit(EXIT_SUCCESS);