diff options
| author | tmm <tmm@FreeBSD.org> | 2003-05-30 11:05:08 +0000 |
|---|---|---|
| committer | tmm <tmm@FreeBSD.org> | 2003-05-30 11:05:08 +0000 |
| commit | 4a94fb79dbf8595ed1be871114c15bf841e2da08 (patch) | |
| tree | 196ebc150d9c61d28eb9f2451b3dbcb0f90882d0 /lib/libc | |
| parent | 0c3c12a82d69a5456b37ed1885f2a3ebeaf477fd (diff) | |
| download | FreeBSD-src-4a94fb79dbf8595ed1be871114c15bf841e2da08.zip FreeBSD-src-4a94fb79dbf8595ed1be871114c15bf841e2da08.tar.gz | |
Fix a sizeof error in __bt_put: when writing they key and data sizes
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)
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/db/btree/bt_put.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c index ea12bc0..42b6f7e 100644 --- a/lib/libc/db/btree/bt_put.c +++ b/lib/libc/db/btree/bt_put.c @@ -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; } |
