ext/dba: switch dba_handlers full_info path to zend_string API

Author: arshidkv12

ext/dba/dba.c

@@ -1282,10 +1282,8 @@ PHP_FUNCTION(dba_handlers)
 
 	for (const dba_handler *hptr = handler; hptr->name; hptr++) {
 		if (full_info) {
-			// TODO: avoid reallocation ???
-			char *str = hptr->info(hptr, NULL);
-			add_assoc_string(return_value, hptr->name, str);
-			efree(str);
+			zend_string *str = hptr->info(hptr, NULL);
+			add_assoc_str(return_value, hptr->name, str);
 		} else {
 			add_next_index_string(return_value, hptr->name);
 		}

ext/dba/dba_cdb.c

@@ -318,13 +318,16 @@ DBA_SYNC_FUNC(cdb)
 DBA_INFO_FUNC(cdb)
 {
 #ifdef DBA_CDB_BUILTIN
+	char* version_str = NULL;
 	if (!strcmp(hnd->name, "cdb")) {
-		return estrdup(cdb_version());
+		version_str = cdb_version();
+		return zend_string_init(cdb_version, strlen(cdb_version), false);
 	} else {
-		return estrdup(cdb_make_version());
+		version_str = cdb_make_version();
+		return zend_string_init(cdb_version, strlen(cdb_version), false);
 	}
 #else
-	return estrdup("External");
+	return zend_string_init("External", strlen("External"), false);
 #endif
 }
 

ext/dba/dba_db1.c

@@ -177,7 +177,7 @@ DBA_SYNC_FUNC(db1)
 
 DBA_INFO_FUNC(db1)
 {
-	return estrdup(DB1_VERSION);
+	return zend_string_init(DB1_VERSION, strlen(DB1_VERSION), false);
 }
 
 #endif

ext/dba/dba_db2.c

@@ -187,7 +187,7 @@ DBA_SYNC_FUNC(db2)
 
 DBA_INFO_FUNC(db2)
 {
-	return estrdup(DB_VERSION_STRING);
+	return zend_string_init(DB_VERSION_STRING, strlen(DB_VERSION_STRING), false);
 }
 
 #endif

ext/dba/dba_db3.c

@@ -225,7 +225,7 @@ DBA_SYNC_FUNC(db3)
 
 DBA_INFO_FUNC(db3)
 {
-	return estrdup(DB_VERSION_STRING);
+	return zend_string_init(DB_VERSION_STRING, strlen(DB_VERSION_STRING), false);
 }
 
 #endif

ext/dba/dba_db4.c

@@ -282,7 +282,7 @@ DBA_SYNC_FUNC(db4)
 
 DBA_INFO_FUNC(db4)
 {
-	return estrdup(DB_VERSION_STRING);
+	return zend_string_init(DB_VERSION_STRING, strlen(DB_VERSION_STRING), false);
 }
 
 #endif

ext/dba/dba_dbm.c

@@ -192,7 +192,7 @@ DBA_INFO_FUNC(dbm)
 		return dba_info_gdbm(hnd, info);
 	}
 #endif
-	return estrdup(DBM_VERSION);
+	return zend_string_init(DBM_VERSION, strlen(DBM_VERSION), false);
 }
 
 #endif

ext/dba/dba_flatfile.c

@@ -166,8 +166,9 @@ DBA_SYNC_FUNC(flatfile)
 }
 
 DBA_INFO_FUNC(flatfile)
-{
-	return estrdup(flatfile_version());
+{	
+	char* version = flatfile_version();
+	return zend_string_init(version, strlen(version), false);
 }
 
 #endif

ext/dba/dba_inifile.c

@@ -186,7 +186,8 @@ DBA_SYNC_FUNC(inifile)
 
 DBA_INFO_FUNC(inifile)
 {
-	return estrdup(inifile_version());
+	const char* version = inifile_version();
+	return zend_string_init(version, strlen(version), false);
 }
 
 #endif

ext/dba/dba_lmdb.c

@@ -360,7 +360,7 @@ DBA_SYNC_FUNC(lmdb)
 
 DBA_INFO_FUNC(lmdb)
 {
-	return estrdup(MDB_VERSION_STRING);
+	return zend_string_init(MDB_VERSION_STRING, strlen(MDB_VERSION_STRING), false);
 }
 
 #endif