Skip to content

String size refactor take 2, partial fixes to ext/standard #5

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.

Sign up for GitHub

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
merged 37 commits into from
Aug 17, 2013
Merged

String size refactor take 2, partial fixes to ext/standard #5

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
1e53ccd
fixed merge mistake
weltling Aug 13, 2013
f95cd93
Fix unused variable warning in OCI8 2.0
cjbj Aug 13, 2013
f4dc224
Fixed #65431 (Discarded qualifiers from pointer target warnings when …
laruence Aug 14, 2013
f3d18ad
Merge branch 'PHP-5.4' into PHP-5.5
laruence Aug 14, 2013
b6fa0b4
Merge branch 'PHP-5.5'
laruence Aug 14, 2013
2874696
Fix CVE-2013-4073 - handling of certs with null bytes
smalyshev Aug 14, 2013
dcea4ec
Fix CVE-2013-4073 - handling of certs with null bytes
smalyshev Aug 14, 2013
7f69f07
Merge branch 'PHP-5.3' into PHP-5.4
smalyshev Aug 14, 2013
2b9f5ac
Merge branch 'PHP-5.4' into PHP-5.5
smalyshev Aug 14, 2013
4da6273
Merge branch 'PHP-5.5'
smalyshev Aug 14, 2013
9d4e5b0
Fix to file uploads >2G with size overflow
weltling Aug 14, 2013
9d62807
Skip test if SKIP_ONLINE_TESTS set
cjbj Aug 14, 2013
8c61758
Merge branch 'PHP-5.4' into PHP-5.5
cjbj Aug 14, 2013
7595176
Merge branch 'PHP-5.5'
cjbj Aug 14, 2013
9ad97cd
Reduce (some) compile noise of 'unused variable' and 'may be used uni…
cjbj Aug 15, 2013
39612af
Merge branch 'PHP-5.4' into PHP-5.5
cjbj Aug 15, 2013
3c166c4
Merge branch 'PHP-5.5'
cjbj Aug 15, 2013
8280393
Fixed #65431 in zend_exception.c by Sixd
laruence Aug 15, 2013
cb361ed
Merge branch 'PHP-5.4' into PHP-5.5
laruence Aug 15, 2013
7d3ec0c
Merge branch 'PHP-5.5'
laruence Aug 15, 2013
cd14de9
Reduce compiler noise by removing unused variables and labels
cjbj Aug 15, 2013
4824d0f
Merge branch 'PHP-5.5'
cjbj Aug 15, 2013
ac03b67
Remove unused variable
cjbj Aug 15, 2013
ba30c78
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into…
cjbj Aug 15, 2013
5a186a3
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into…
cjbj Aug 15, 2013
de0a602
Merge branch 'master' of https://git.php.net/repository/php-src
cjbj Aug 15, 2013
82dd6b9
Merge branch 'PHP-5.4' into PHP-5.5
cjbj Aug 15, 2013
77dea78
Merge branch 'PHP-5.5'
cjbj Aug 15, 2013
f12f3ab
Prepare news for PHP-5.5.2
dsp Aug 15, 2013
e8a4477
New news section
dsp Aug 15, 2013
30502db
Merge branch 'PHP-5.5'
dsp Aug 15, 2013
715b040
Merge branch 'master' of https://github.com/php/php-src into string_s…
weltling Aug 16, 2013
a7a797b
adapted all the zend_parse_parameters() calls
weltling Aug 16, 2013
5c75422
fixed substr()
weltling Aug 16, 2013
6b067db
fixed strstr()
weltling Aug 17, 2013
99442a3
small correction to substr
weltling Aug 17, 2013
91ceb29
Fixed substr(), but no kidding now.
weltling Aug 17, 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
Prev Previous commit
Next Next commit
fixed strstr()
  • Loading branch information
@weltling
weltling committed Aug 17, 2013
commit 6b067db5fbdc92521e47cf6f05c675b66b671879
6 changes: 3 additions & 3 deletions ext/standard/string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2999,9 +2999,9 @@ static PPRES *php_strtr_array_prepare(STR *text, PATNREPL *patterns, int patnum,
}
}
res->hash->entries[HASH_TAB_SIZE] = patnum; /* OK, we effectively allocated SIZE+1 */
for (i = HASH_TAB_SIZE - 1; i >= 0; i--) {
if (res->hash->entries[i] == -1) {
res->hash->entries[i] = res->hash->entries[i + 1];
for (i = HASH_TAB_SIZE; i > 0; i--) {
if (res->hash->entries[i-1] == -1) {
res->hash->entries[i-1] = res->hash->entries[i];
}
}

Expand Down