mDNSResponder-878.250.4.tar.gz

[apple/mdnsresponder.git] / mDNSWindows / DNSServiceBrowser / Windows / Sources / ChooserDialog.cpp

diff --git a/mDNSWindows/DNSServiceBrowser/Windows/Sources/ChooserDialog.cpp b/mDNSWindows/DNSServiceBrowser/Windows/Sources/ChooserDialog.cpp
index 9e4db65b260d6508746652efca5f2da462238af6..fe46be08b613b231168916942fd5cfd5a6ad9f5f 100644 (file)
--- a/mDNSWindows/DNSServiceBrowser/Windows/Sources/ChooserDialog.cpp
+++ b/mDNSWindows/DNSServiceBrowser/Windows/Sources/ChooserDialog.cpp
@@ -269,7 +269,7 @@ static void
                DNSStatus                               inStatusCode,
                const DNSBrowserEvent * inEvent );
 
                DNSStatus                               inStatusCode,
                const DNSBrowserEvent * inEvent );
 

-static char *  DNSNetworkAddressToString( const DNSNetworkAddress *inAddr, char *outString );
+static char *  DNSNetworkAddressToString( const DNSNetworkAddress *inAddr, size_t inLen, char *outString );

 
 static DWORD   UTF8StringToStringObject( const char *inUTF8, CString &inObject );
 static DWORD   StringObjectToUTF8String( CString &inObject, std::string &outUTF8 );
 
 static DWORD   UTF8StringToStringObject( const char *inUTF8, CString &inObject );
 static DWORD   StringObjectToUTF8String( CString &inObject, std::string &outUTF8 );


@@ -1273,8 +1273,8 @@ static void
                                        serviceInstance->name           = inEvent->data.resolved->name;
                                        serviceInstance->type           = inEvent->data.resolved->type;
                                        serviceInstance->domain         = inEvent->data.resolved->domain;
                                        serviceInstance->name           = inEvent->data.resolved->name;
                                        serviceInstance->type           = inEvent->data.resolved->type;
                                        serviceInstance->domain         = inEvent->data.resolved->domain;

-                                       serviceInstance->ip                     = DNSNetworkAddressToString( &inEvent->data.resolved->address, s );
-                                       serviceInstance->ifIP           = DNSNetworkAddressToString( &inEvent->data.resolved->interfaceIP, s );
+                                       serviceInstance->ip                     = DNSNetworkAddressToString( &inEvent->data.resolved->address, sizeof( s ), s );
+                                       serviceInstance->ifIP           = DNSNetworkAddressToString( &inEvent->data.resolved->interfaceIP, sizeof( s ), s );

                                        serviceInstance->text           = inEvent->data.resolved->textRecord;
                                        serviceInstance->hostName       = inEvent->data.resolved->hostName;
 
                                        serviceInstance->text           = inEvent->data.resolved->textRecord;
                                        serviceInstance->hostName       = inEvent->data.resolved->hostName;
 


@@ -1303,7 +1303,7 @@ static void
 //     Note: Currently only supports IPv4 network addresses.
 //===========================================================================================================================
 
 //     Note: Currently only supports IPv4 network addresses.
 //===========================================================================================================================
 

-static char *  DNSNetworkAddressToString( const DNSNetworkAddress *inAddr, char *outString )
+static char *  DNSNetworkAddressToString( const DNSNetworkAddress *inAddr, size_t inLen, char *outString )

 {
        const DNSUInt8 *                p;
        DNSUInt16                               port;
 {
        const DNSUInt8 *                p;
        DNSUInt16                               port;


@@ -1312,11 +1312,11 @@ static char *   DNSNetworkAddressToString( const DNSNetworkAddress *inAddr, char *
        port = ntohs( inAddr->u.ipv4.port.v16 );
        if( port != kDNSPortInvalid )
        {
        port = ntohs( inAddr->u.ipv4.port.v16 );
        if( port != kDNSPortInvalid )
        {

-               sprintf( outString, "%u.%u.%u.%u:%u", p[ 0 ], p[ 1 ], p[ 2 ], p[ 3 ], port );
+               snprintf( outString, inLen, "%u.%u.%u.%u:%u", p[ 0 ], p[ 1 ], p[ 2 ], p[ 3 ], port );

        }
        else
        {
        }
        else
        {

-               sprintf( outString, "%u.%u.%u.%u", p[ 0 ], p[ 1 ], p[ 2 ], p[ 3 ] );
+               snprintf( outString, inLen, "%u.%u.%u.%u", p[ 0 ], p[ 1 ], p[ 2 ], p[ 3 ] );

        }
        return( outString );
 }
        }
        return( outString );
 }