[Bf-blender-cvs] [53580265118] master: Cleanup: quiet -Warray-bounds warning
Campbell Barton
noreply at git.blender.org
Tue May 8 13:33:25 CEST 2018
Commit: 53580265118236a096257b50f29d354243bdefe3
Author: Campbell Barton
Date: Tue May 8 13:32:52 2018 +0200
Branches: master
https://developer.blender.org/rB53580265118236a096257b50f29d354243bdefe3
Cleanup: quiet -Warray-bounds warning
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 7d73b3050a6..9e9481566b0 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -765,7 +765,9 @@ static BHeadN *get_bhead(FileData *fd)
bh8_from_bh4(&bhead, &bhead4);
}
else {
- memcpy(&bhead, &bhead4, sizeof(bhead));
+ /* MIN2 is only to quiet '-Warray-bounds' compiler warning. */
+ BLI_assert(sizeof(bhead) == sizeof(bhead4));
+ memcpy(&bhead, &bhead4, MIN2(sizeof(bhead), sizeof(bhead4)));
}
}
else {
@@ -786,7 +788,9 @@ static BHeadN *get_bhead(FileData *fd)
bh4_from_bh8(&bhead, &bhead8, (fd->flags & FD_FLAGS_SWITCH_ENDIAN));
}
else {
- memcpy(&bhead, &bhead8, sizeof(bhead));
+ /* MIN2 is only to quiet '-Warray-bounds' compiler warning. */
+ BLI_assert(sizeof(bhead) == sizeof(bhead8));
+ memcpy(&bhead, &bhead8, MIN2(sizeof(bhead), sizeof(bhead8)));
}
}
else {
More information about the Bf-blender-cvs
mailing list