aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-01-19 18:43:12 +0100
committerSverker Eriksson <[email protected]>2016-01-19 18:43:12 +0100
commitdaa9ca6ff54697b18d407ae91a91b587662dfc99 (patch)
treedc22b9ed6bf0f719fe6cde0b1072ef659449bd2a /erts/emulator
parentfcfa908ab59a21101ced5f362f8129519f576910 (diff)
parentae116fb714d54ca40bcd897195de521b0ca39f8c (diff)
downloadotp-daa9ca6ff54697b18d407ae91a91b587662dfc99.tar.gz
otp-daa9ca6ff54697b18d407ae91a91b587662dfc99.tar.bz2
otp-daa9ca6ff54697b18d407ae91a91b587662dfc99.zip
Merge branch 'sverk/armata-memset-bug' into maint
* sverk/armata-memset-bug: erts: Workaround memset bug in test case
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/alloc_SUITE_data/threads.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/test/alloc_SUITE_data/threads.c b/erts/emulator/test/alloc_SUITE_data/threads.c
index a8a6a23695..2f5f841e3d 100644
--- a/erts/emulator/test/alloc_SUITE_data/threads.c
+++ b/erts/emulator/test/alloc_SUITE_data/threads.c
@@ -396,7 +396,7 @@ alloc_op(int t_no, Allctr_t *a, block *bp, int id, int clean_up)
bp->p = (unsigned char *) ALLOC(a, bp->s);
if(!bp->p)
fail(t_no, "ALLOC(%lu) failed [id=%d])\n", bp->s, id);
- memset((void *) bp->p, id, (size_t) bp->s);
+ memset((void *) bp->p, (unsigned char)id, (size_t) bp->s);
}
else {
unsigned char *p = (unsigned char *) REALLOC(a, bp->p, bp->as[bp->i]);
@@ -406,7 +406,7 @@ alloc_op(int t_no, Allctr_t *a, block *bp, int id, int clean_up)
if(bp->s < bp->as[bp->i]) {
CHECK_BLOCK_DATA(t_no, p, bp->s, id);
- memset((void *) p, id, (size_t) bp->as[bp->i]);
+ memset((void *) p, (unsigned char)id, (size_t) bp->as[bp->i]);
}
else
CHECK_BLOCK_DATA(t_no, p, bp->as[bp->i], id);