2 Commits

Author SHA1 Message Date
vms
cb62ab800e fix sqlite3_bind_blob 2021-01-28 00:13:52 +03:00
vms
4179ccd6f9 fix blob/text setters and getters 2020-11-09 04:39:38 +03:00
3 changed files with 29 additions and 12 deletions

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 cargo install fcli
RUN cargo install fcli --version 0.1.12
VOLUME /code
WORKDIR /code

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) {
const char *result = sqlite3_column_blob(pStmt, i);
const char *blob = sqlite3_column_blob(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);
}
@ -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) {
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);
set_result_size(strlen((const char *)result));
unsigned char *copied_text = malloc(text_len);
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){
@ -1435,13 +1442,22 @@ static int bindText(
int sqlite3_bind_blob_(
sqlite3_stmt *pStmt,
int i,
const void *zData,
char *zData,
int nData,
void (*xDel)(void*)
) __EXPORT_NAME(sqlite3_bind_blob) {
const int copied_nData = nData / 8;
char *copied_zData = malloc(copied_nData);
const int result = sqlite3_bind_blob(pStmt, i, zData, nData, xDel);
free((void *)zData);
if (copied_zData == 0) {
return -1;
}
for (int char_id = 0; char_id < copied_nData; ++char_id) {
copied_zData[char_id] = zData[char_id * 8];
}
const int result = sqlite3_bind_blob(pStmt, i, copied_zData, copied_nData, 0);
return result;
}
@ -1530,8 +1546,10 @@ int sqlite3_bind_text_(
int nData,
void (*xDel)(void*)
) __EXPORT_NAME(sqlite3_bind_text) {
const int result = sqlite3_bind_text(pStmt, i, zData, nData, xDel);
free((char *)zData);
char *copied_zData = malloc(nData);
memcpy(copied_zData, zData, nData);
const int result = sqlite3_bind_text(pStmt, i, copied_zData, nData, xDel);
return result;
}

View File

@ -28,4 +28,3 @@ int get_result_size(void) {
const char *get_result_ptr() {
return RESULT_PTR;
}