]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 14:43:33 +0000 (16:43 +0200)
committerAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 14:43:33 +0000 (16:43 +0200)
* PHP-5.6:
  updated NEWS
  updated NEWS
  fix memory leak in pdo_pgsql closeCursor (bug 69752)

1  2 
ext/pdo_pgsql/pgsql_statement.c

index 60553b36ce06bf506e5ef374fdb5e7bedfa69f02,657c386b0c2eb84ae49e1990e1fcb89333ce7c03..835c4dd97db4f7c8e4c15dbdaf5c626a00f87f2a
@@@ -616,8 -610,14 +616,14 @@@ done
        return 1;
  }
  
 -static int pdo_pgsql_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC)
 +static int pdo_pgsql_stmt_cursor_closer(pdo_stmt_t *stmt)
  {
+       pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data;
+       if (S->cols != NULL){
+               efree(S->cols);
+               S->cols = NULL;
+       }
        return 1;
  }