GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

bugfix in computing record lengths

Browse Source
This commit is contained in:
krangelov
2019-02-14 15:29:33 +01:00
parent 951b884118
commit ef21d08225
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/runtime/c/sg/sg.c
View File

@@ -499,14 +499,17 @@ store_expr(SgSG* sg,
PgfExprLit* elit = ei.data; PgfExprLit* elit = ei.data;
Mem mem[2]; Mem mem[2];
size_t len = 0;
GuVariantInfo li = gu_variant_open(elit->lit); GuVariantInfo li = gu_variant_open(elit->lit);
switch (li.tag) { switch (li.tag) {
case PGF_LITERAL_STR: { case PGF_LITERAL_STR: {
PgfLiteralStr* lstr = li.data; PgfLiteralStr* lstr = li.data;
len = strlen(lstr->val);
mem[0].flags = MEM_Str; mem[0].flags = MEM_Str;
mem[0].n = strlen(lstr->val); mem[0].n = len;
mem[0].z = lstr->val; mem[0].z = lstr->val;
break; break;
} }
@@ -515,6 +518,7 @@ store_expr(SgSG* sg,
mem[0].flags = MEM_Int; mem[0].flags = MEM_Int;
mem[0].u.i = lint->val; mem[0].u.i = lint->val;
len = sizeof(mem[0].u.i);
break; break;
} }
case PGF_LITERAL_FLT: { case PGF_LITERAL_FLT: {
@@ -522,6 +526,7 @@ store_expr(SgSG* sg,
mem[0].flags = MEM_Real; mem[0].flags = MEM_Real;
mem[0].u.r = lflt->val; mem[0].u.r = lflt->val;
len = sizeof(mem[0].u.r);
break; break;
} }
default: default:
@@ -556,7 +561,7 @@ store_expr(SgSG* sg,
int serial_type_arg = sqlite3BtreeSerialType(&mem[1], file_format); int serial_type_arg = sqlite3BtreeSerialType(&mem[1], file_format);
int serial_type_arg_hdr_len = sqlite3BtreeVarintLen(serial_type_arg); int serial_type_arg_hdr_len = sqlite3BtreeVarintLen(serial_type_arg);
unsigned char* buf = malloc(1+serial_type_lit_hdr_len+(serial_type_arg_hdr_len > 1 ? serial_type_arg_hdr_len : 1)+mem[0].n+8); unsigned char* buf = malloc(1+serial_type_lit_hdr_len+(serial_type_arg_hdr_len > 1 ? serial_type_arg_hdr_len : 1)+len+8);
unsigned char* p = buf; unsigned char* p = buf;
*p++ = 1+serial_type_lit_hdr_len+serial_type_arg_hdr_len; *p++ = 1+serial_type_lit_hdr_len+serial_type_arg_hdr_len;
p += putVarint32(p, serial_type_lit); p += putVarint32(p, serial_type_lit);