Skip to content

String size refactor take 2 next wave #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
fc16b92
Fix bug #46311: Pointer aliasing issue results in miscompile on gcc4.4
nikic Aug 22, 2013
4db494a
Merge branch 'PHP-5.5'
nikic Aug 22, 2013
e212320
Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTI…
cjbj Aug 20, 2013
b668a26
Fix pgsql notice test failure
nikic Aug 22, 2013
592677d
Fix intl build
nikic Aug 22, 2013
647059a
Merge branch 'PHP-5.5'
nikic Aug 22, 2013
96045e1
Forgot newline in test
nikic Aug 22, 2013
1a88fcc
Remove trailing whitespace in test
nikic Aug 22, 2013
c0d99fd
Apply pgsql notice test fixes to PHP-5.5
nikic Aug 22, 2013
926987b
Merge branch 'PHP-5.5'
nikic Aug 22, 2013
d598747
Fixed other compiler warnings
mbeccati Aug 22, 2013
908da14
Merge branch 'PHP-5.4' into PHP-5.5
mbeccati Aug 22, 2013
80917e5
Merge branch 'PHP-5.5'
mbeccati Aug 22, 2013
320e82b
trivial fix spl_autoload_functions()
weltling Aug 22, 2013
5efaa8f
adapted the function args for ereg
weltling Aug 22, 2013
a61f5bf
Revert "Suppress compliation warning "warning: passing argument 1 of …
cjbj Aug 22, 2013
f2ceb49
Revert "Suppress compliation warning "warning: passing argument 1 of …
cjbj Aug 22, 2013
18282f4
Revert "Suppress compliation warning "warning: passing argument 1 of …
cjbj Aug 22, 2013
7109f36
Suppress compliation warning "warning: passing argument 1 of ‘_efree’…
cjbj Aug 22, 2013
c1ecdfb
Merge branch 'PHP-5.4' into PHP-5.5
cjbj Aug 22, 2013
27954a8
Merge branch 'PHP-5.5'
cjbj Aug 22, 2013
6b474bb
adapted all the function arg formats in ext/zlib
weltling Aug 23, 2013
5ab6d21
Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTI…
cjbj Aug 20, 2013
686402a
Merge branch 'PHP-5.4' into PHP-5.5
nikic Aug 23, 2013
c0856a1
Merge branch 'PHP-5.5'
nikic Aug 23, 2013
f2a4f31
fixed ext/pcre internal stuff
weltling Aug 23, 2013
2a28a30
fix pcre usage in spl
weltling Aug 23, 2013
3d49768
fixed set process_title()
weltling Aug 23, 2013
a2b1546
ensure the test doesn't fail because of tz warning
weltling Aug 23, 2013
77303a3
Merge branch 'PHP-5.5'
weltling Aug 23, 2013
38f9c51
Update NEWS
cjbj Aug 23, 2013
716fc80
Suppress static analyzer warnings in specialized executor
weltling Aug 23, 2013
07fa043
Merge branch 'PHP-5.5'
weltling Aug 23, 2013
644278c
Merge branch 'master' of https://github.com/php/php-src into string_s…
weltling Aug 23, 2013
9382c75
replaced all the arg formats and Z_STRLEN
weltling Aug 24, 2013
2bf8f91
fixed sapi filter usage
weltling Aug 24, 2013
2545fbb
fixed the mb_regex* stuff
weltling Aug 24, 2013
1492bc1
adapted args in ext/intl
weltling Aug 24, 2013
07b87a2
Z_STRLEN vs Z_STRSIZE in ext/intl
weltling Aug 24, 2013
14f8e16
more fixes to ext/intl
weltling Aug 24, 2013
9c81da4
ext/intl further converting
weltling Aug 26, 2013
6e4395b
ext/intl further fixes
weltling Aug 26, 2013
3266be8
fixed ext/iconv
weltling Aug 27, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/pdo/pdo_dbh.c
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@ static PHP_METHOD(PDO, lastInsertId)
pdo_raise_impl_error(dbh, NULL, "IM001", "driver does not support lastInsertId()" TSRMLS_CC);
RETURN_FALSE;
} else {
Z_STRVAL_P(return_value) = dbh->methods->last_id(dbh, name, &Z_STRLEN_P(return_value) TSRMLS_CC);
Z_STRVAL_P(return_value) = dbh->methods->last_id(dbh, name, (unsigned int *)&Z_STRLEN_P(return_value) TSRMLS_CC);
if (!Z_STRVAL_P(return_value)) {
PDO_HANDLE_DBH_ERR();
RETURN_FALSE;
Expand Down
2 changes: 1 addition & 1 deletion ext/pdo/pdo_stmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value,
zval_ptr_dtor(&val);
pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "cannot unserialize class" TSRMLS_CC);
return 0;
} else if (ce->unserialize(&return_value, ce, Z_TYPE_P(val) == IS_STRING ? Z_STRVAL_P(val) : "", Z_TYPE_P(val) == IS_STRING ? Z_STRLEN_P(val) : 0, NULL TSRMLS_CC) == FAILURE) {
} else if (ce->unserialize(&return_value, ce, (unsigned char *)(Z_TYPE_P(val) == IS_STRING ? Z_STRVAL_P(val) : ""), Z_TYPE_P(val) == IS_STRING ? Z_STRLEN_P(val) : 0, NULL TSRMLS_CC) == FAILURE) {
zval_ptr_dtor(&val);
pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "cannot unserialize class" TSRMLS_CC);
zval_dtor(return_value);
Expand Down
5 changes: 4 additions & 1 deletion ext/pgsql/pgsql.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
#define PGSQL_MAX_LENGTH_OF_LONG 30
#define PGSQL_MAX_LENGTH_OF_DOUBLE 60

#if LONG_MAX < UINT_MAX
#define PGSQL_RETURN_OID(oid) do { \
if (oid > LONG_MAX) { \
smart_str s = {0}; \
Expand All @@ -72,7 +73,9 @@
} \
RETURN_LONG((long)oid); \
} while(0)

#else
#define PGSQL_RETURN_OID(oid) (RETURN_LONG((long)oid))
#endif

#if HAVE_PQSETNONBLOCKING
#define PQ_SETNONBLOCKING(pg_link, flag) PQsetnonblocking(pg_link, flag)
Expand Down