1 files changed, 41 insertions, 15 deletions

diff --git a/lib/crypto/c_src/info.c b/lib/crypto/c_src/info.c
index 3f3194081d..42f477fead 100644
--- a/lib/crypto/c_src/info.c
+++ b/lib/crypto/c_src/info.c
@@ -30,21 +30,30 @@ char *crypto_callback_name = "crypto_callback.valgrind";
 char *crypto_callback_name = "crypto_callback";
 # endif
 
-int change_basename(ErlNifBinary* bin, char* buf, int bufsz, const char* newfile)
+int change_basename(ErlNifBinary* bin, char* buf, size_t bufsz, const char* newfile)
 {
-    int i;
+    size_t i;
+    size_t newlen;
 
     for (i = bin->size; i > 0; i--) {
 	if (bin->data[i-1] == '/')
 	    break;
     }
-    if (i + strlen(newfile) >= bufsz) {
-	PRINTF_ERR0("CRYPTO: lib name too long");
-	return 0;
-    }
+
+    newlen = strlen(newfile);
+    if (i > SIZE_MAX - newlen)
+        goto err;
+
+    if (i + newlen >= bufsz)
+        goto err;
+
     memcpy(buf, bin->data, i);
     strcpy(buf+i, newfile);
+
     return 1;
+
+ err:
+    return 0;
 }
 
 void error_handler(void* null, const char* errstr)
@@ -53,16 +62,25 @@ void error_handler(void* null, const char* errstr)
 }
 #endif /* HAVE_DYNAMIC_CRYPTO_LIB */
 
-ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
+ERL_NIF_TERM info_lib(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{/* () */
     /* [{<<"OpenSSL">>,9470143,<<"OpenSSL 0.9.8k 25 Mar 2009">>}] */
 
-    static const char libname[] = "OpenSSL";
-    unsigned name_sz = strlen(libname);
-    const char* ver = SSLeay_version(SSLEAY_VERSION);
-    unsigned ver_sz = strlen(ver);
     ERL_NIF_TERM name_term, ver_term;
-    int ver_num = OPENSSL_VERSION_NUMBER;
+    static const char libname[] = "OpenSSL";
+    size_t name_sz;
+    const char* ver;
+    size_t ver_sz;
+    int ver_num;
+    unsigned char *out_name, *out_ver;
+
+    ASSERT(argc == 0);
+
+    name_sz = strlen(libname);
+    ver = SSLeay_version(SSLEAY_VERSION);
+    ver_sz = strlen(ver);
+    ver_num = OPENSSL_VERSION_NUMBER;
+
     /* R16:
      * Ignore library version number from SSLeay() and instead show header
      * version. Otherwise user might try to call a function that is implemented
@@ -72,10 +90,18 @@ ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
      * Version string is still from library though.
      */
 
-    memcpy(enif_make_new_binary(env, name_sz, &name_term), libname, name_sz);
-    memcpy(enif_make_new_binary(env, ver_sz, &ver_term), ver, ver_sz);
+    if ((out_name = enif_make_new_binary(env, name_sz, &name_term)) == NULL)
+        goto err;
+    if ((out_ver = enif_make_new_binary(env, ver_sz, &ver_term)) == NULL)
+        goto err;
+
+    memcpy(out_name, libname, name_sz);
+    memcpy(out_ver, ver, ver_sz);
 
     return enif_make_list1(env, enif_make_tuple3(env, name_term,
 						 enif_make_int(env, ver_num),
 						 ver_term));
+
+ err:
+    return enif_make_badarg(env);
 }