d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a sizeof error in __bt_put: when writing they key and data sizes

Browse Source 
to a buffer in the big key/data case, memmove() was used on pointers
to size_ts, but only sizeof(u_int32_t) bytes where copied. This broke
on big_endian architectures where sizeof(size_t) > sizeof(u_int32_t).

This bug broke portupgrade (by way of ruby_bdb1) on sparc64.

Approved by:	re (rwatson)
This commit is contained in:
Thomas Moestl 2003-05-30 11:05:08 +00:00
parent dfc36ded78
commit 6bc615b0a1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libc/db/btree/bt_put.c
View File

@ -78,7 +78,7 @@ __bt_put(dbp, key, data, flags)
PAGE *h;
indx_t index, nxtindex;
pgno_t pg;
u_int32_t nbytes;
u_int32_t nbytes, tmp;
int dflags, exact, status;
char *dest, db[NOVFLSIZE], kb[NOVFLSIZE];
@ -131,8 +131,9 @@ storekey: if (__ovfl_put(t, key, &pg) == RET_ERROR)
tkey.data = kb;
tkey.size = NOVFLSIZE;
memmove(kb, &pg, sizeof(pgno_t));
tmp = key->size;
memmove(kb + sizeof(pgno_t),
&key->size, sizeof(u_int32_t));
&tmp, sizeof(u_int32_t));
dflags |= P_BIGKEY;
key = &tkey;
}
@ -142,8 +143,9 @@ storekey: if (__ovfl_put(t, key, &pg) == RET_ERROR)
tdata.data = db;
tdata.size = NOVFLSIZE;
memmove(db, &pg, sizeof(pgno_t));
tmp = data->size;
memmove(db + sizeof(pgno_t),
&data->size, sizeof(u_int32_t));
&tmp, sizeof(u_int32_t));
dflags |= P_BIGDATA;
data = &tdata;
}