diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-01-19 14:02:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-01-19 14:02:02 +0100 |
| commit | b5f7bf6ed9c59b8841efcd41c2ed1687f080f4cf (patch) | |
| tree | 33505cf8b844dcf774672bb6fa36dbe816fe9b54 | |
| parent | 8c4fbd1a153245fd3c496507693140c0e8e2f260 (diff) | |
| download | vim-git-b5f7bf6ed9c59b8841efcd41c2ed1687f080f4cf.tar.gz | |
updated for version 7.3.773v7.3.773
Problem: Crash when OriginalFirstThunk is zero.
Solution: Skip items with OriginalFirstThunk not set. (Ken Takata)
| -rw-r--r-- | src/mbyte.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index 5f82edf8d..7fdd44dc3 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -4317,6 +4317,8 @@ get_iconv_import_func(HINSTANCE hInst, const char *funcname) .VirtualAddress); for (; pImpDesc->FirstThunk; ++pImpDesc) { + if (!pImpDesc->OriginalFirstThunk) + continue; pIAT = (PIMAGE_THUNK_DATA)(pImage + pImpDesc->FirstThunk); pINT = (PIMAGE_THUNK_DATA)(pImage + pImpDesc->OriginalFirstThunk); for (; pIAT->u1.Function; ++pIAT, ++pINT) diff --git a/src/version.c b/src/version.c index 8b9a2414b..b3e1c2903 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 773, +/**/ 772, /**/ 771, |