summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mbyte.c2
-rw-r--r--src/version.c2
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,