fix a stack overflow bug

shenwii · Nov 1, 2021 · 8b8676d · 8b8676d
1 parent b6ed50c
commit 8b8676d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/sample.ini b/sample.ini
@@ -6,7 +6,7 @@ bind_addr6 = ::
 ;bind port
 bind_port = 8123
 ;preferred use of ipv6
-ipv6_first = 1
+ipv6_first = 0
 ;secret key
 key = zfTUq4rVLgqPLAJT7tgEgft2PDfVwbI4DVnqZpM3FGA=
 

diff --git a/src/aes.c b/src/aes.c
@@ -27,5 +27,17 @@ int aes_encrypt(__const__ unsigned char *indata, __const__ int len, unsigned cha
 
 int aes_decrypt(__const__ unsigned char *indata, __const__ int len, unsigned char *outdata, __const__ unsigned char *key)
 {
-    return __aes_en_de_crypt(AES_DECRYPT, indata, AES_ENCRYPT_LEN(len), outdata, key);
+    int tmp_len = AES_ENCRYPT_LEN(len);
+    unsigned char *tmp_buf = malloc(tmp_len);
+    if(tmp_buf == NULL)
+        return 1;
+    int rtn = __aes_en_de_crypt(AES_DECRYPT, indata, tmp_len, tmp_buf, key);
+    if(rtn != 0)
+    {
+        free(tmp_buf);
+        return rtn;
+    }
+    memcpy(outdata, tmp_buf, len);
+    free(tmp_buf);
+    return rtn;
 }