Module Name:    src
Committed By:   martin
Date:           Wed Sep 13 09:48:11 UTC 2023

Modified Files:
        src/external/apache2/mDNSResponder/dist/mDNSCore [netbsd-9]:
            DNSCommon.c
        src/external/apache2/mDNSResponder/dist/mDNSPosix [netbsd-9]:
            mDNSPosix.c

Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #1731):

        external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c: revision 1.19
        external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c: revision 1.11

mDNSPosix.c: free very large struct on error path

DNSCommon.c: fix punctuation in a comment

This has very little value in itself; it's intended to make a material
change to this file to facilitate rebuilds. Otherwise, people running
update builds on branches will run into mismatches and build failures
after our switch to use arc4random(3). (That is, this change is
intended to be pulled up.)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.4.1 \
    src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 \
    src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c

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

Modified files:

Index: src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.9 src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.9.4.1
--- src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.9	Wed Apr 11 18:33:48 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c	Wed Sep 13 09:48:11 2023
@@ -3754,7 +3754,7 @@ mDNSexport mStatus mDNSSendDNSMessage(mD
         m->UnicastPacketsSent++;
 #endif // APPLE_OSX_mDNSResponder
 
-    // Zero-length message data is okay (e.g. for a DNS Update ack, where all we need is an ID and an error code
+    // Zero-length message data is okay (e.g. for a DNS Update ack, where all we need is an ID and an error code)
     if (end < msg->data || end - msg->data > AbsoluteMaxDNSMessageData)
     {
         LogMsg("mDNSSendDNSMessage: invalid message %p %p %d", msg->data, end, end - msg->data);

Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.16.2.1 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.16.2.2
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.16.2.1	Sun Jul 26 10:44:28 2020
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c	Wed Sep 13 09:48:11 2023
@@ -1266,6 +1266,8 @@ mDNSlocal mStatus WatchForInterfaceChang
     err = OpenIfNotifySocket(&pChgRec->NotifySD);
     if (err == 0)
         err = mDNSPosixAddFDToEventLoop(pChgRec->NotifySD, InterfaceChangeCallback, pChgRec);
+    if (err)
+        mDNSPlatformMemFree(pChgRec);
 
     return err;
 }

Reply via email to