From: Nikita Popov <nikic@php.net>
Date: Thu, 11 Sep 2014 14:05:39 +0000 (+0200)
Subject: Fix ext/dba ini handling
X-Git-Tag: PRE_NATIVE_TLS_MERGE~150^2~17^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fca85d92cc7671c9b24f596407b7eca6068883f1;p=php

Fix ext/dba ini handling

Doing this change blindly based on gcov output
---

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 6bb98e24b5..b1f618a992 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -470,19 +470,19 @@ ZEND_INI_MH(OnUpdateDefaultHandler)
 {
 	dba_handler *hptr;
 
-	if (!strlen(new_value)) {
+	if (!new_value->len) {
 		DBA_G(default_hptr) = NULL;
-		return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+		return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 	}
 
-	for (hptr = handler; hptr->name && strcasecmp(hptr->name, new_value); hptr++);
+	for (hptr = handler; hptr->name && strcasecmp(hptr->name, new_value->val); hptr++);
 
 	if (!hptr->name) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such handler: %s", new_value);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such handler: %s", new_value->val);
 		return FAILURE;
 	}
 	DBA_G(default_hptr) = hptr;
-	return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+	return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
 
 PHP_INI_BEGIN()