]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Mon, 29 Feb 2016 15:30:33 +0000 (16:30 +0100)
committerAnatol Belski <ab@php.net>
Mon, 29 Feb 2016 15:30:33 +0000 (16:30 +0100)
* PHP-5.6:
  remove unneeded free parts

1  2 
ext/pdo_dblib/dblib_stmt.c

index 43802264b68da8a9119da93bacfc93f4202d2c2b,e4a6d82200d02fc8bcb7a92e24aa496839fab631..d8cd219b4aaddd7b9ae81c43d02b8543a04696ee
@@@ -121,19 -110,8 +110,8 @@@ static int pdo_dblib_stmt_dtor(pdo_stmt
  {
        pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data;
  
-       if (stmt->columns) {
-               int i = 0;
-               for (; i < stmt->column_count; i++) {
-                       if (stmt->columns[i].name) {
-                               zend_string_release(stmt->columns[i].name);
-                       }
-               }
-               efree(stmt->columns); 
-               stmt->columns = NULL;
-       }
        efree(S);
 -              
 +
        return 1;
  }