Improved cloudsync_payload_load

Author: marcobambini

src/cloudsync.c

@@ -2348,14 +2348,15 @@ void cloudsync_payload_load (sqlite3_context *context, int argc, sqlite3_value *
     // retrieve full path to file
     const char *path = (const char *)sqlite3_value_text(argv[0]);
 
-    size_t payload_size = 0;
+    sqlite3_int64 payload_size = 0;
     char *payload = file_read(path, &payload_size);
     if (!payload) {
         if (payload_size == -1) sqlite3_result_error(context, "Unable to read payload from file path.", -1);
+        if (payload) cloudsync_memory_free(payload);
         return;
     }
 
-    int nrows = cloudsync_payload_apply (context, payload, (int)payload_size);
+    int nrows = (payload_size) ? cloudsync_payload_apply (context, payload, (int)payload_size) : 0;
     if (payload) cloudsync_memory_free(payload);
 
     // returns number of applied rows

src/cloudsync.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#define CLOUDSYNC_VERSION                       "0.8.35"
+#define CLOUDSYNC_VERSION                       "0.8.36"
 
 int sqlite3_cloudsync_init (sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi);
 

src/utils.c

@@ -322,7 +322,7 @@ static bool file_read_all (int fd, char *buf, size_t n) {
     return true;
 }
 
-char *file_read (const char *path, size_t *len) {
+char *file_read (const char *path, sqlite3_int64 *len) {
     int fd = -1;
     char *buffer = NULL;
 
@@ -359,6 +359,7 @@ char *file_read (const char *path, size_t *len) {
     return buffer;
 
 abort_read:
+    //fprintf(stderr, "file_read: failed to read '%s': %s\n", path, strerror(errno));
     if (len) *len = -1;
     if (buffer) cloudsync_memory_free(buffer);
     if (fd >= 0) file_close(fd);

src/utils.h

@@ -151,7 +151,7 @@ void cloudsync_rowid_decode (sqlite3_int64 rowid, sqlite3_int64 *db_version, sql
 // available only on Desktop OS
 #ifdef CLOUDSYNC_DESKTOP_OS
 bool file_delete (const char *path);
-char *file_read (const char *path, size_t *len);
+char *file_read (const char *path, sqlite3_int64 *len);
 bool file_write (const char *path, const char *buffer, size_t len);
 #endif