From 40c3aefafbf7553ca8480fa88dad97b2b8b7b552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?= Date: Mon, 11 Oct 2010 03:07:03 +0000 Subject: [PATCH] - Removed redundant local variable in dns_get_record. - (5.3) Fixed bug in the Windows implementation of dns_get_record, where the two last parameters wouldn't be filled unless the type were DNS_ANY (Gustavo). --- NEWS | 2 ++ ext/standard/dns.c | 6 ++---- ext/standard/dns_win32.c | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 431e79c5b25..0a9c9d0b016 100644 --- a/NEWS +++ b/NEWS @@ -24,6 +24,8 @@ - Changed the $context parameter on copy() to actually have an effect. (Kalle) - Fixed possible crash in mssql_fetch_batch(). (Kalle) - Fixed inconsistent backlog default value (-1) in FPM on many systems. (fat) +- Fixed bug in the Windows implementation of dns_get_record, where the two + last parameters wouldn't be filled unless the type were DNS_ANY (Gustavo). - Fixed bug #53021 (In html_entity_decode, failure to convert numeric entities with ENT_NOQUOTES and ISO-8859-1). Fixed and extended the fix of ENT_NOQUOTES diff --git a/ext/standard/dns.c b/ext/standard/dns.c index 103d6904f8e..1a3455f5900 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -697,7 +697,6 @@ PHP_FUNCTION(dns_get_record) int hostname_len; long type_param = PHP_DNS_ANY; zval *authns = NULL, *addtl = NULL; - int addtl_recs = 0; int type_to_fetch; #if defined(HAVE_DNS_SEARCH) struct sockaddr_storage from; @@ -724,7 +723,6 @@ PHP_FUNCTION(dns_get_record) if (addtl) { zval_dtor(addtl); array_init(addtl); - addtl_recs = 1; } if (type_param & ~PHP_DNS_ALL && type_param != PHP_DNS_ANY) { @@ -742,7 +740,7 @@ PHP_FUNCTION(dns_get_record) * - In case of PHP_DNS_ANY we use the directly fetch DNS_T_ANY. (step NUMTYPES+1 ) */ for (type = (type_param == PHP_DNS_ANY ? (PHP_DNS_NUM_TYPES + 1) : 0); - type < (addtl_recs ? (PHP_DNS_NUM_TYPES + 2) : PHP_DNS_NUM_TYPES) || first_query; + type < (addtl ? (PHP_DNS_NUM_TYPES + 2) : PHP_DNS_NUM_TYPES) || first_query; type++ ) { first_query = 0; @@ -858,7 +856,7 @@ PHP_FUNCTION(dns_get_record) } } - if (addtl_recs && addtl) { + if (addtl) { /* Additional records associated with authoritative name servers */ while (ar-- > 0 && cp && cp < end) { zval *retval = NULL; diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c index ac3aab00b17..a6e5b0a4838 100644 --- a/ext/standard/dns_win32.c +++ b/ext/standard/dns_win32.c @@ -337,7 +337,6 @@ PHP_FUNCTION(dns_get_record) long type_param = PHP_DNS_ANY; zval *authns = NULL, *addtl = NULL; int type, type_to_fetch, first_query = 1, store_results = 1; - int addtl_recs = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lzz", &hostname, &hostname_len, &type_param, &authns, &addtl) == FAILURE) { return; @@ -361,7 +360,7 @@ PHP_FUNCTION(dns_get_record) array_init(return_value); for (type = (type_param == PHP_DNS_ANY ? (PHP_DNS_NUM_TYPES + 1) : 0); - type < (addtl_recs ? (PHP_DNS_NUM_TYPES + 2) : PHP_DNS_NUM_TYPES) || first_query; + type < (addtl ? (PHP_DNS_NUM_TYPES + 2) : PHP_DNS_NUM_TYPES) || first_query; type++ ) { DNS_STATUS status; /* Return value of DnsQuery_A() function */