JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed crash on wine by adding NULL check after memchr

Browse Source 
This is not a joke, there are vendors out there who build software for cygwin
only. Besides, this NULL check is good to have anyway.
This commit is contained in:
Arseniy Lartsev 2020-01-07 16:34:39 +01:00 committed by Corinna Vinschen
parent 7b6414d459
commit 4ddf5903fd
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/path.cc
View File

@ -4307,6 +4307,8 @@ find_fast_cwd_pointer ()
const uint8_t *use_cwd = rcall + 5 + offset; const uint8_t *use_cwd = rcall + 5 + offset;
/* Find first `push %edi' instruction. */ /* Find first `push %edi' instruction. */
const uint8_t *pushedi = (const uint8_t *) memchr (use_cwd, 0x57, 32); const uint8_t *pushedi = (const uint8_t *) memchr (use_cwd, 0x57, 32);
if (!pushedi)
return NULL;
/* ...which should be followed by `mov crit-sect-addr,%edi' then /* ...which should be followed by `mov crit-sect-addr,%edi' then
`push %edi', or by just a single `push crit-sect-addr'. */ `push %edi', or by just a single `push crit-sect-addr'. */
const uint8_t *movedi = pushedi + 1; const uint8_t *movedi = pushedi + 1;