Changeset: 2fef9a3dad61 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2fef9a3dad61
Modified Files:
monetdb5/mal/mal_instruction.c
sql/backends/monet5/vaults/parquet/pqc_reader.c
Branch: default
Log Message:
Set size of variable part of struct before using it.
This helps with running when _FORTIFY_SOURCE is defined.
diffs (28 lines):
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -375,10 +375,10 @@ copyInstructionArgs(MalBlkPtr mb, const
if (new == NULL)
return new;
memcpy(new, p, offsetof(InstrRecord, argv) + p->maxarg *
sizeof(p->argv[0]));
+ new->maxarg = args;
if (args > p->maxarg)
memset(new->argv + p->maxarg, 0, (args - p->maxarg) *
sizeof(new->argv[0]));
new->typeresolved = false;
- new->maxarg = args;
return new;
}
diff --git a/sql/backends/monet5/vaults/parquet/pqc_reader.c
b/sql/backends/monet5/vaults/parquet/pqc_reader.c
--- a/sql/backends/monet5/vaults/parquet/pqc_reader.c
+++ b/sql/backends/monet5/vaults/parquet/pqc_reader.c
@@ -526,8 +526,8 @@ blob_read_dict( pqc_creader_t *cr, uint3
data += sizeof(int);
blob *b = (blob*)buf;
+ b->nitems = len;
memcpy(b->data, data, len);
- b->nitems = len;
offsets[i] = (int) (buf - obuf);
rc[i] = buf;
buf += (sizeof(size_t)+len+15)&(~15);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
