From: Anatol Belski <ab@php.net>
Date: Mon, 29 Feb 2016 15:30:33 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.5RC1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44c3f1492f698f9ebc3e279d5e4471c7f576973f;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  remove unneeded free parts
---

44c3f1492f698f9ebc3e279d5e4471c7f576973f
diff --cc ext/pdo_dblib/dblib_stmt.c
index 43802264b6,e4a6d82200..d8cd219b4a
--- a/ext/pdo_dblib/dblib_stmt.c
+++ b/ext/pdo_dblib/dblib_stmt.c
@@@ -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;
  }