force return NULL pointer on CODEC error

sjlombardo · sjlombardo · commit dff5b425622e · 2020-11-10T17:35:19.000-05:00
diff --git a/src/crypto.c b/src/crypto.c
@@ -714,6 +714,7 @@ static void* sqlite3Codec(void *iCtx, void *data, Pgno pgno, int mode) {
       if(rc != SQLITE_OK) { /* clear results of failed cipher operation and set error */
         sqlcipher_memset((unsigned char*) buffer+offset, 0, page_sz-offset);
         sqlcipher_codec_ctx_set_error(ctx, rc);
+        return NULL;
       }
       memcpy(pData, buffer, page_sz); /* copy buffer data back to pData and return */
       return pData;
@@ -739,6 +740,7 @@ static void* sqlite3Codec(void *iCtx, void *data, Pgno pgno, int mode) {
       if(rc != SQLITE_OK) { /* clear results of failed cipher operation and set error */
         sqlcipher_memset((unsigned char*)buffer+offset, 0, page_sz-offset);
         sqlcipher_codec_ctx_set_error(ctx, rc);
+        return NULL;
       }
       return buffer; /* return persistent buffer data, pData remains intact */
       break;
diff --git a/test/sqlcipher-codecerror.text b/test/sqlcipher-codecerror.text
@@ -111,7 +111,7 @@ do_test codec-error-journal-wal {
   execsql {
     PRAGMA cipher_fail_next_encrypt = 0;
     PRAGMA key = 'testkey';
---    PRAGMA integrity_check;
+    PRAGMA integrity_check;
     PRAGMA cipher_integrity_check;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ do_test codec-error-journal-wal {`
`111`	`111`	`execsql {`
`112`	`112`	`PRAGMA cipher_fail_next_encrypt = 0;`
`113`	`113`	`PRAGMA key = 'testkey';`
`114`		`--- PRAGMA integrity_check;`
	`114`	`+ PRAGMA integrity_check;`
`115`	`115`	`PRAGMA cipher_integrity_check;`
`116`	`116`	`}`
`117`	`117`