fluencelabs/sqlite
1
0
Fork 0
mirror of https://github.com/fluencelabs/sqlite synced 2025-04-24 17:02:14 +00:00
Code Issues Projects Releases Wiki Activity

fix blob/text setters and getters

Browse Source
This commit is contained in:
vms 2020-11-09 04:39:38 +03:00
parent df5cbd0b0f
commit 4179ccd6f9
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -9,7 +9,7 @@ RUN apt-get update \
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-11/wasi-sdk-11.0-linux.tar.gz | tar xz --strip-components=1 -C / RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-11/wasi-sdk-11.0-linux.tar.gz | tar xz --strip-components=1 -C /
RUN cargo install fcli RUN cargo install fcli --version 0.1.12
VOLUME /code VOLUME /code
WORKDIR /code WORKDIR /code

28
src/vdbeapi.c
View File

@ -1110,10 +1110,13 @@ static void columnMallocFailure(sqlite3_stmt *pStmt)
*/ */
void sqlite3_column_blob_(sqlite3_stmt *pStmt, int i) __EXPORT_NAME(sqlite3_column_blob) { void sqlite3_column_blob_(sqlite3_stmt *pStmt, int i) __EXPORT_NAME(sqlite3_column_blob) {
const char *result = sqlite3_column_blob(pStmt, i); const char *blob = sqlite3_column_blob(pStmt, i);
int blob_len = sqlite3_column_bytes(pStmt, i); int blob_len = sqlite3_column_bytes(pStmt, i);
set_result_ptr((char *)result); unsigned char *copied_result = malloc(blob_len);
memcpy(copied_result, blob, blob_len);
set_result_ptr((char *)copied_result);
set_result_size(blob_len); set_result_size(blob_len);
} }
@ -1154,10 +1157,14 @@ sqlite_int64 sqlite3_column_int64(sqlite3_stmt *pStmt, int i){
} }
void sqlite3_column_text_(sqlite3_stmt *pStmt, int i) __EXPORT_NAME(sqlite3_column_text) { void sqlite3_column_text_(sqlite3_stmt *pStmt, int i) __EXPORT_NAME(sqlite3_column_text) {
const unsigned char *result = sqlite3_column_text(pStmt, i); const unsigned char *text = sqlite3_column_text(pStmt, i);
const unsigned int text_len = sqlite3_column_bytes(pStmt, i);
set_result_ptr((char *)result); unsigned char *copied_text = malloc(text_len);
set_result_size(strlen((const char *)result)); memcpy(copied_text, text, text_len);
set_result_ptr((char *)copied_text);
set_result_size(text_len);
} }
const unsigned char *sqlite3_column_text(sqlite3_stmt *pStmt, int i){ const unsigned char *sqlite3_column_text(sqlite3_stmt *pStmt, int i){
@ -1439,9 +1446,10 @@ int sqlite3_bind_blob_(
int nData, int nData,
void (*xDel)(void*) void (*xDel)(void*)
) __EXPORT_NAME(sqlite3_bind_blob) { ) __EXPORT_NAME(sqlite3_bind_blob) {
char *copied_zData = malloc(nData);
memcpy(copied_zData, zData, nData);
const int result = sqlite3_bind_blob(pStmt, i, zData, nData, xDel); const int result = sqlite3_bind_blob(pStmt, i, copied_zData, nData, xDel);
free((void *)zData);
return result; return result;
} }
@ -1530,8 +1538,10 @@ int sqlite3_bind_text_(
int nData, int nData,
void (*xDel)(void*) void (*xDel)(void*)
) __EXPORT_NAME(sqlite3_bind_text) { ) __EXPORT_NAME(sqlite3_bind_text) {
const int result = sqlite3_bind_text(pStmt, i, zData, nData, xDel); char *copied_zData = malloc(nData);
free((char *)zData); memcpy(copied_zData, zData, nData);
const int result = sqlite3_bind_text(pStmt, i, copied_zData, nData, xDel);
return result; return result;
} }