fix: segmentation fault due to invalid cast, wrong debug log (#132) (#133)

Author: 2EXP

lib/resty/proxy-wasm.lua

@@ -38,8 +38,13 @@ typedef struct {
 } ngx_str_t;
 
 typedef struct {
-    ngx_str_t   key;
-    ngx_str_t   value;
+    int         len;
+    u_char     *data;
+} ngx_http_lua_ffi_str_t;
+
+typedef struct {
+    ngx_http_lua_ffi_str_t  key;
+    ngx_http_lua_ffi_str_t  value;
 } proxy_wasm_table_elt_t;
 
 void *ngx_http_wasm_load_plugin(const char *name, size_t name_len, const char *code, size_t size);

src/http/ngx_http_wasm_api.c

@@ -978,9 +978,10 @@ ngx_http_wasm_req_get_headers(ngx_http_request_t *r, int32_t addr, int32_t size_
         ngx_memcpy(key, headers[i].key.data, headers[i].key.len);
         ngx_memcpy(val, headers[i].value.data, headers[i].value.len);
 
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "wasm request header: \"%V: %V\"",
-                       &headers[i].key, &headers[i].value);
+        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "wasm request header: \"%*s: %*s\"",
+                       headers[i].key.len, headers[i].key.data,
+                       headers[i].value.len, headers[i].value.data);
     }
 
     /* get pseudo headers :path, :method, :scheme */
@@ -1387,7 +1388,7 @@ ngx_http_wasm_http_call_resp_get_header(ngx_http_request_t *r, char *key,  int32
     hdr = ctx->call_resp_headers;
 
     for (i = 0; i < ctx->call_resp_n_header; i++) {
-        if ((size_t) key_size != hdr[i].key.len) {
+        if (key_size != hdr[i].key.len) {
             continue;
         }
 

src/proxy_wasm/proxy_wasm_types.h

@@ -19,11 +19,12 @@
 
 
 #include <ngx_core.h>
+#include <ngx_http_lua_api.h>
 
 
 typedef struct {
-    ngx_str_t       key;
-    ngx_str_t       value;
+    ngx_http_lua_ffi_str_t  key;
+    ngx_http_lua_ffi_str_t  value;
 } proxy_wasm_table_elt_t;