diff options
author | dhill <> | 2010-12-16 18:47:01 +0000 |
---|---|---|
committer | dhill <> | 2010-12-16 18:47:01 +0000 |
commit | f8462bc35307b082a00e0adb51b4785d31acf09d (patch) | |
tree | 437bdcef92574626813a4d32e48b3ac55cdfaa2b /src | |
parent | 38fbee892c374a918c82fc635ef106bfe05c0f62 (diff) | |
download | openbsd-f8462bc35307b082a00e0adb51b4785d31acf09d.tar.gz openbsd-f8462bc35307b082a00e0adb51b4785d31acf09d.tar.bz2 openbsd-f8462bc35307b082a00e0adb51b4785d31acf09d.zip |
avoid pointer arithmetic on void *
tested for a while by me.
ok otto@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libc/stdlib/malloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 566e1e72e6..8d7d3ae18a 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: malloc.c,v 1.126 2010/10/21 08:09:35 otto Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.127 2010/12/16 18:47:01 dhill Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> | 3 | * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> |
4 | * | 4 | * |
@@ -1159,7 +1159,7 @@ omalloc(size_t sz, int zero_fill) | |||
1159 | } else { | 1159 | } else { |
1160 | if (mopts.malloc_junk) { | 1160 | if (mopts.malloc_junk) { |
1161 | if (zero_fill) | 1161 | if (zero_fill) |
1162 | memset(p + sz - mopts.malloc_guard, | 1162 | memset((char *)p + sz - mopts.malloc_guard, |
1163 | SOME_JUNK, psz - sz); | 1163 | SOME_JUNK, psz - sz); |
1164 | else | 1164 | else |
1165 | memset(p, SOME_JUNK, | 1165 | memset(p, SOME_JUNK, |
@@ -1372,9 +1372,9 @@ orealloc(void *p, size_t newsz) | |||
1372 | if (rnewsz > roldsz) { | 1372 | if (rnewsz > roldsz) { |
1373 | if (!mopts.malloc_guard) { | 1373 | if (!mopts.malloc_guard) { |
1374 | STATS_INC(g_pool->cheap_realloc_tries); | 1374 | STATS_INC(g_pool->cheap_realloc_tries); |
1375 | zapcacheregion(g_pool, p + roldsz); | 1375 | zapcacheregion(g_pool, (char *)p + roldsz); |
1376 | q = MMAPA(p + roldsz, rnewsz - roldsz); | 1376 | q = MMAPA((char *)p + roldsz, rnewsz - roldsz); |
1377 | if (q == p + roldsz) { | 1377 | if (q == (char *)p + roldsz) { |
1378 | malloc_used += rnewsz - roldsz; | 1378 | malloc_used += rnewsz - roldsz; |
1379 | if (mopts.malloc_junk) | 1379 | if (mopts.malloc_junk) |
1380 | memset(q, SOME_JUNK, | 1380 | memset(q, SOME_JUNK, |