Skip to content

Commit fec71e3

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix #78342: Bus error in configure test for iconv //IGNORE
2 parents 99fe047 + 585131f commit fec71e3

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 7.4.0beta2
44

5+
- Iconv:
6+
. Fixed bug #78342 (Bus error in configure test for iconv //IGNORE). (Rainer
7+
Jung)
58

69
25 Jul 2019, PHP 7.4.0beta1
710

ext/iconv/config.m4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@ int main() {
162162
163163
int main() {
164164
iconv_t cd = iconv_open( "UTF-8//IGNORE", "UTF-8" );
165+
if(cd == (iconv_t)-1) {
166+
return 1;
167+
}
165168
char *in_p = "\xC3\xC3\xC3\xB8";
166169
size_t in_left = 4, out_left = 4096;
167170
char *out = malloc(out_left);

0 commit comments

Comments
 (0)