mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avoid UB when int is added to a pointer

Browse Source
This commit is contained in:
Jinhao 2016-06-10 16:02:20 +08:00
parent 5b1891c186
commit 9c7ffbeb15
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/deploy.cpp
View File

@ -500,16 +500,15 @@ namespace nana
if (uv < 0xC0)
return false;
if ((uv < 0xE0) && (ustr + 1 < end))
if ((uv < 0xE0) && (end - ustr > 1))
ustr += 2;
else if (uv < 0xF0 && (ustr + 2 <= end))
else if ((uv < 0xF0) && (end - ustr > 2))
ustr += 3;
else if (uv < 0x1F && (ustr + 3 <= end))
else if ((uv < 0x1F) && (end - ustr > 3))
ustr += 4;
else
return false;
}
return true;
}