Merge branch 'PHP-5.5' into PHP-5.6

LawnGnome · LawnGnome · commit 3ef6e3726cd4 · 2014-12-30T17:59:39.000Z
* PHP-5.5:
  Check the return value of lo_export.
diff --git a/NEWS b/NEWS
@@ -60,6 +60,9 @@
   . Fixed bug #66679 (Alignment Bug in PCRE 8.34 upstream).
     (Rainer Jung, Anatol Belski)
 
+- pgsql:
+  . Fixed bug #68697 (lo_export return -1 on failure). (Ondřej Surý)
+
 - PDO_mysql:
   . Fixed bug #68424 (Add new PDO mysql connection attr to control multi
     statements option). (peter dot wolanin at acquia dot com)
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -3731,10 +3731,10 @@ PHP_FUNCTION(pg_lo_export)
 
 	ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
 
-	if (lo_export(pgsql, oid, file_out)) {
-		RETURN_TRUE;
+	if (lo_export(pgsql, oid, file_out) == -1) {
+		RETURN_FALSE;
 	}
-	RETURN_FALSE;
+	RETURN_TRUE;
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -3731,10 +3731,10 @@ PHP_FUNCTION(pg_lo_export)`
`3731`	`3731`
`3732`	`3732`	`ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);`
`3733`	`3733`
`3734`		`- if (lo_export(pgsql, oid, file_out)) {`
`3735`		`- RETURN_TRUE;`
	`3734`	`+ if (lo_export(pgsql, oid, file_out) == -1) {`
	`3735`	`+ RETURN_FALSE;`
`3736`	`3736`	`}`
`3737`		`- RETURN_FALSE;`
	`3737`	`+ RETURN_TRUE;`
`3738`	`3738`	`}`
`3739`	`3739`	`/* }}} */`
`3740`	`3740`