forked from Lainports/freebsd-ports
1ff56b9f93
The segfault fix was originally developed by our upstream, sqlite.org, to address S/390 and Sparc segfaults, both of which are big endian. Our PowerPC is also big endian, which this patch also fixes. Inspired by: src r360223 Approved by: Approved by: portmgr (blanket: run-time bugfix) Obtained from: https://www.sqlite.org/src/vinfo/04885763c4cd00cb?diff=1 https://sqlite.org/forum/forumpost/672291a5b2
18 lines
851 B
C
18 lines
851 B
C
--- sqlite3.c.orig 2020-01-27 12:25:19.000000000 -0800
|
|
+++ sqlite3.c 2020-04-23 19:24:26.380323000 -0700
|
|
@@ -121302,12 +121302,14 @@
|
|
x = *sqlite3VdbeGetOp(v, addrConflictCk);
|
|
if( x.opcode!=OP_IdxRowid ){
|
|
int p2; /* New P2 value for copied conflict check opcode */
|
|
+ const char *zP4;
|
|
if( sqlite3OpcodeProperty[x.opcode]&OPFLG_JUMP ){
|
|
p2 = lblRecheckOk;
|
|
}else{
|
|
p2 = x.p2;
|
|
}
|
|
- sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, x.p4.z, x.p4type);
|
|
+ zP4 = x.p4type==P4_INT32 ? SQLITE_INT_TO_PTR(x.p4.i) : x.p4.z;
|
|
+ sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, zP4, x.p4type);
|
|
sqlite3VdbeChangeP5(v, x.p5);
|
|
VdbeCoverageIf(v, p2!=x.p2);
|
|
}
|