diff options
| -rw-r--r-- | src/mbyte.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index 61a7d8bd6..ce0c8975e 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -4129,7 +4129,7 @@ iconv_string(vcp, str, slen, unconvlenp, resultlenp) done = to - (char *)result; } - if (resultlenp != NULL) + if (resultlenp != NULL && result != NULL) *resultlenp = (int)(to - (char *)result); return result; } diff --git a/src/version.c b/src/version.c index 77cd01002..3cc982e1f 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 159, +/**/ 158, /**/ 157, |