Merge pull request #5 from fluencelabs/fix_bwu

fix BWU compatibility

sqlite3.wit

@@ -231,6 +231,7 @@
 (@interface func (type 19)
   arg.get 0
   string.size
+  i32.push 1
   call-core 0
   arg.get 0
   string.lower_memory
@@ -238,6 +239,7 @@
   i32.from_s32
   arg.get 2
   string.size
+  i32.push 1
   call-core 0
   arg.get 2
   string.lower_memory
@@ -307,6 +309,7 @@
   i32.from_u32
   arg.get 1
   string.size
+  i32.push 1
   call-core 0
   arg.get 1
   string.lower_memory
@@ -349,6 +352,7 @@
   i32.from_s32
   arg.get 2
   string.size
+  i32.push 1
   call-core 0
   arg.get 2
   string.lower_memory
@@ -366,6 +370,7 @@
   i32.from_u32
   arg.get 1
   string.size
+  i32.push 1
   call-core 0
   arg.get 1
   string.lower_memory

src/vdbeapi.c

@@ -1447,7 +1447,13 @@ int sqlite3_bind_blob(
 #ifdef SQLITE_ENABLE_API_ARMOR
   if( nData<0 ) return SQLITE_MISUSE_BKPT;
 #endif
+
+#ifdef __sqlite_unmodified_upstream
   return bindText(pStmt, i, zData, nData, xDel, 0);
+#else
+  // xDel is a custom deallocator, due to our IT architecture it can't be provided from other modules.
+  return bindText(pStmt, i, zData, nData, free, 0);
+#endif
 }
 int sqlite3_bind_blob64(
   sqlite3_stmt *pStmt, 
@@ -1521,7 +1527,12 @@ int sqlite3_bind_text(
   int nData, 
   void (*xDel)(void*)
 ){
+#ifdef __sqlite_unmodified_upstream
   return bindText(pStmt, i, zData, nData, xDel, SQLITE_UTF8);
+#else
+  // xDel is a custom deallocator, due to our IT architecture it can't be provided from other modules.
+  return bindText(pStmt, i, zData, nData, free, SQLITE_UTF8);
+#endif
 }
 int sqlite3_bind_text64( 
   sqlite3_stmt *pStmt, 

src/wrapper.c

@@ -8,7 +8,11 @@ int RESULT_SIZE;
 
 cvector_vector_type(void *) OBJECTS_TO_RELEASE;
 
-void* allocate(size_t size) {
+void* allocate(size_t size, size_t _type_tag) {
+  if (size == 0 || size + 1 == 0) {
+    return 0;
+  }
+
   // this +1 is needed to append then zero byte to strings passing to this module.
   return malloc(size + 1);
 }