Merge changes from HEAD.

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 7fc8e60d6945f60f85374cffae614004a03181f4..c432b70018f281c59673864599874bf0f7433c7f 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -220,9 +220,14 @@ static PHP_MINFO_FUNCTION(dba)
 
        php_info_print_table_start();
        php_info_print_table_row(2, "DBA support", "enabled");
-       php_info_print_table_row(2, "Supported handlers", handlers.c);
+       if (handlers.c) {
+               smart_str_0(&handlers);
+               php_info_print_table_row(2, "Supported handlers", handlers.c);
+               smart_str_free(&handlers);
+       } else {
+               php_info_print_table_row(2, "Supported handlers", "none");
+       }
        php_info_print_table_end();
-       smart_str_free(&handlers);
 }