updated for version 7.3.159

Problem:    Using uninitialized pointer when out of memory.
Solution:   Check for NULL return value.

diff --git a/src/mbyte.c b/src/mbyte.c
index 61a7d8bd65ad0c5ed463d01a05cdfa40e5ffb32b..ce0c8975eebc3400878b3627ccb3720e9c54208d 100644 (file)
--- 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 77cd01002600e158fe33dcc752fb76179d32027b..3cc982e1fb13d5f526846335b952e1aa74b71b64 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    159,
 /**/
     158,
 /**/