Merge branch 'PHP-5.6'

LawnGnome · LawnGnome · commit 2d561e0e26a5 · 2014-12-30T18:01:51.000Z
* PHP-5.6:
  Check the return value of lo_export.
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -3728,10 +3728,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
`@@ -3728,10 +3728,10 @@ PHP_FUNCTION(pg_lo_export)`
`3728`	`3728`
`3729`	`3729`	`ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, "PostgreSQL link", le_link, le_plink);`
`3730`	`3730`
`3731`		`- if (lo_export(pgsql, oid, file_out)) {`
`3732`		`- RETURN_TRUE;`
	`3731`	`+ if (lo_export(pgsql, oid, file_out) == -1) {`
	`3732`	`+ RETURN_FALSE;`
`3733`	`3733`	`}`
`3734`		`- RETURN_FALSE;`
	`3734`	`+ RETURN_TRUE;`
`3735`	`3735`	`}`
`3736`	`3736`	`/* }}} */`
`3737`	`3737`