Repository navigation
Commit 4270414
authored
Fix Calendar::createInstance double-free of the adopted TimeZone (#23320)
ICU 57+ Calendar::createInstance wraps the TimeZone in a LocalPointer
and deletes it when the calendar cannot be created. PHP deleted the
same pointer again on that failure. Drop the extra delete in
createInstance and fromDateTime.1 parent 3571d36 commit 4270414
2 files changed
Lines changed: 3 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
18 | 21 | | |
19 | 22 | | |
20 | 23 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
99 | | - | |
100 | 99 | | |
101 | 100 | | |
102 | 101 | | |
| |||
1073 | 1072 | | |
1074 | 1073 | | |
1075 | 1074 | | |
1076 | | - | |
1077 | 1075 | | |
1078 | 1076 | | |
1079 | 1077 | | |
| |||
0 commit comments