diff options
author | Stuart Herbert <stuart@gentoo.org> | 2005-09-06 07:46:04 +0000 |
---|---|---|
committer | Stuart Herbert <stuart@gentoo.org> | 2005-09-06 07:46:04 +0000 |
commit | a24bb2e6f1a20959e73c20fb698fa976c79a6851 (patch) | |
tree | dd47241b4c3c6ab11179a55be49cfb401591d98d /dev-php5/pecl-pdo | |
parent | Removed corrupted patch file (diff) | |
download | gentoo-2-a24bb2e6f1a20959e73c20fb698fa976c79a6851.tar.gz gentoo-2-a24bb2e6f1a20959e73c20fb698fa976c79a6851.tar.bz2 gentoo-2-a24bb2e6f1a20959e73c20fb698fa976c79a6851.zip |
Replaced corrupted patch file
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-php5/pecl-pdo')
-rw-r--r-- | dev-php5/pecl-pdo/ChangeLog | 5 | ||||
-rw-r--r-- | dev-php5/pecl-pdo/Manifest | 2 | ||||
-rw-r--r-- | dev-php5/pecl-pdo/files/pdo_stmt.c.diff | 34 |
3 files changed, 39 insertions, 2 deletions
diff --git a/dev-php5/pecl-pdo/ChangeLog b/dev-php5/pecl-pdo/ChangeLog index 74ff08ad2def..a83fbd6857c5 100644 --- a/dev-php5/pecl-pdo/ChangeLog +++ b/dev-php5/pecl-pdo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-php5/pecl-pdo # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/ChangeLog,v 1.1 2005/09/04 16:32:39 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/ChangeLog,v 1.2 2005/09/06 07:46:04 stuart Exp $ + + 06 Sep 2005; Stuart Herbert <stuart@gentoo.org> +files/pdo_stmt.c.diff: + Replaced corrupt patch file 18 Aug 2005; <stuart@gentoo.org> ChangeLog: Initial version; replaces older dev-php/* packages diff --git a/dev-php5/pecl-pdo/Manifest b/dev-php5/pecl-pdo/Manifest index 83b334cd4fb4..f5ef83dbc4f3 100644 --- a/dev-php5/pecl-pdo/Manifest +++ b/dev-php5/pecl-pdo/Manifest @@ -2,4 +2,4 @@ MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 MD5 f3e38be1298be5cfdc02db4b45bd942b ChangeLog 307 MD5 c2c6cbd9d74d129e47990bd2856eb1bd pecl-pdo-0.9.ebuild 1571 MD5 6279556cf34bf92200701c7a65f81ed9 files/digest-pecl-pdo-0.9 55 -MD5 f174bf741295f458409014dcc8057242 files/pdo_stmt.c.diff 923 +MD5 c52b46703f8061eb524872fa24edc342 files/pdo_stmt.c.diff 915 diff --git a/dev-php5/pecl-pdo/files/pdo_stmt.c.diff b/dev-php5/pecl-pdo/files/pdo_stmt.c.diff new file mode 100644 index 000000000000..06f433c01e51 --- /dev/null +++ b/dev-php5/pecl-pdo/files/pdo_stmt.c.diff @@ -0,0 +1,34 @@ +--- pdo_stmt.c 2005-07-27 04:06:11.000000000 +0200 ++++ pdo_stmt.c 2005-08-06 20:50:17.000000000 +0200 +@@ -18,7 +18,7 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id: pdo_stmt.c,v 1.116 2005/07/22 14:31:20 helly Exp $ */ ++/* $Id: pdo_stmt.c,v 1.118 2005/08/03 18:26:16 iliaa Exp $ */ + + /* The PDO Statement Handle Class */ + +@@ -1985,12 +1985,20 @@ + struct pdo_column_data *cols = stmt->columns; + + for (i = 0; i < stmt->column_count; i++) { +- efree(cols[i].name); ++ if (cols[i].name) { ++ efree(cols[i].name); ++ cols[i].name = NULL; ++ } + } + efree(stmt->columns); ++ stmt->columns = NULL; ++ } ++ ++ if (stmt->fetch.into && stmt->default_fetch_type == PDO_FETCH_INTO) { ++ FREE_ZVAL(stmt->fetch.into); ++ stmt->fetch.into = NULL; + } + +- + do_fetch_opt_finish(stmt, 1 TSRMLS_CC); + + zend_objects_store_del_ref(&stmt->database_object_handle TSRMLS_CC); |