Merge c048ec9faf4bfe02da004dce69471897933c3617 into 2600eb535296ff1063e9e674ce61be9a90001798

include/typings/stdc.pyi

@@ -5,7 +5,7 @@ intptr = int
 def malloc(size: int) -> intptr: ...
 def free(ptr: intptr) -> None: ...
 
-def memcpy(dst: intptr, src: intptr, n: int) -> None: ...
+def memcpy(dst: intptr, src: intptr | bytes, n: int) -> None: ...
 def memset(s: intptr, c: int, n: int) -> None: ...
 def memcmp(s1: intptr, s2: intptr, n: int) -> int: ...
 

src/modules/lz4.c

@@ -2,6 +2,7 @@
 
 #include <string.h>
 #include <assert.h>
+#include "pocketpy/common/utils.h"
 #include "pocketpy/pocketpy.h"
 #include "lz4/lib/lz4.h"
 
@@ -10,13 +11,13 @@ static bool lz4_compress(int argc, py_Ref argv) {
     PY_CHECK_ARG_TYPE(0, tp_bytes);
     int src_size;
     const void* src = py_tobytes(argv, &src_size);
-    int dst_capacity = LZ4_compressBound(src_size);
+    uint32_t dst_capacity = LZ4_compressBound(src_size);
-    char* p = (char*)py_newbytes(py_retval(), sizeof(int) + dst_capacity);
+    char* p = (char*)py_newbytes(py_retval(), sizeof(uint32_t) + dst_capacity);
-    memcpy(p, &src_size, sizeof(int));
+    memcpy(p, &src_size, sizeof(uint32_t));
-    char* dst = p + sizeof(int);
+    char* dst = p + sizeof(uint32_t);
     int dst_size = LZ4_compress_default(src, dst, src_size, dst_capacity);
     if(dst_size <= 0) return ValueError("LZ4 compression failed");
-    py_bytes_resize(py_retval(), sizeof(int) + dst_size);
+    py_bytes_resize(py_retval(), sizeof(uint32_t) + dst_size);
     return true;
 }
 
@@ -24,15 +25,16 @@ static bool lz4_decompress(int argc, py_Ref argv) {
     PY_CHECK_ARGC(1);
     PY_CHECK_ARG_TYPE(0, tp_bytes);
     int total_size;
-    const int* p = (int*)py_tobytes(argv, &total_size);
+    const uint32_t* p = (uint32_t*)py_tobytes(argv, &total_size);
     const char* src = (const char*)(p + 1);
-    if(total_size < sizeof(int)) return ValueError("invalid LZ4 data");
+    if(total_size < sizeof(uint32_t)) return ValueError("invalid LZ4 data");
-    int uncompressed_size = *p;
+    uint32_t uncompressed_size;
-    if(uncompressed_size < 0) return ValueError("invalid LZ4 data");
+    memcpy(&uncompressed_size, p, sizeof(uint32_t));
+    if(uncompressed_size >= INT32_MAX) return ValueError("invalid LZ4 data");
     char* dst = (char*)py_newbytes(py_retval(), uncompressed_size);
-    int dst_size = LZ4_decompress_safe(src, dst, total_size - sizeof(int), uncompressed_size);
+    int dst_size = LZ4_decompress_safe(src, dst, total_size - sizeof(uint32_t), uncompressed_size);
     if(dst_size < 0) return ValueError("LZ4 decompression failed");
-    assert(dst_size == uncompressed_size);
+    c11__rtassert(dst_size == uncompressed_size);
     return true;
 }
 

src/modules/stdc.c

@@ -124,12 +124,19 @@ static bool stdc_free(int argc, py_Ref argv) {
 
 static bool stdc_memcpy(int argc, py_Ref argv) {
     PY_CHECK_ARGC(3);
-    PY_CHECK_ARG_TYPE(0, tp_int);
+    PY_CHECK_ARG_TYPE(0, tp_int);   // dst
-    PY_CHECK_ARG_TYPE(1, tp_int);
-    PY_CHECK_ARG_TYPE(2, tp_int);
     void* dst = (void*)(intptr_t)py_toint(&argv[0]);
-    void* src = (void*)(intptr_t)py_toint(&argv[1]);
+    PY_CHECK_ARG_TYPE(2, tp_int);   // n
     py_i64 n = py_toint(&argv[2]);
+    void* src;
+    if(py_istype(&argv[1], tp_bytes)) {
+        int size;
+        src = py_tobytes(&argv[1], &size);
+        if(size < n) n = size;
+    } else {
+        PY_CHECK_ARG_TYPE(1, tp_int);   // src
+        src = (void*)(intptr_t)py_toint(&argv[1]);
+    }
     memcpy(dst, src, (size_t)n);
     py_newnone(py_retval());
     return true;