[PHP-CVS] cvs: php-src(PHP_5_1) /ext/standard dns.c

[Ilia Alshanetsky]

iliaa           Sun Oct 23 11:29:09 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/standard       dns.c 
  Log:
  Fixed memory leak on error.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dns.c?r1=1.70.2.1&r2=1.70.2.2&ty=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.1 php-src/ext/standard/dns.c:1.70.2.2
--- php-src/ext/standard/dns.c:1.70.2.1 Fri Oct 21 09:49:01 2005
+++ php-src/ext/standard/dns.c  Sun Oct 23 11:29:09 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dns.c,v 1.70.2.1 2005/10/21 13:49:01 tony2001 Exp $ */
+/* $Id: dns.c,v 1.70.2.2 2005/10/23 15:29:09 iliaa Exp $ */
 
 /* {{{ includes */
 #include "php.h"
@@ -350,7 +350,7 @@
 #endif /* QFIXEDSZ */
 
 #ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN  256
+#define MAXHOSTNAMELEN  1024
 #endif /* MAXHOSTNAMELEN */
 
 #ifndef MAXRESOURCERECORDS
@@ -747,12 +747,14 @@
                        if (n<0) {
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"res_nmkquery() failed");
                                zval_dtor(return_value);
+                               res_nclose(&res);
                                RETURN_FALSE;
                        }
                        n = res_nsend(&res, buf.qb2, n, answer.qb2, sizeof 
answer);
                        if (n<0) {
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"res_nsend() failed");
                                zval_dtor(return_value);
+                               res_nclose(&res);
                                RETURN_FALSE;
                        }
                
@@ -770,6 +772,7 @@
                                if (n < 0) {
                                        php_error_docref(NULL TSRMLS_CC, 
E_WARNING, "Unable to parse DNS data received");
                                        zval_dtor(return_value);
+                                       res_nclose(&res);
                                        RETURN_FALSE;
                                }
                                cp += n + QFIXEDSZ;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php