[Bf-blender-cvs] [c28f2ed] master: Fix T40224: Crash moving objects to another layer

[Campbell Barton]

Commit: c28f2ed4898b582b3efc67aef7f4f01b9e9ac7bd
Author: Campbell Barton
Date:   Tue May 20 21:41:57 2014 +1000
https://developer.blender.org/rBc28f2ed4898b582b3efc67aef7f4f01b9e9ac7bd

Fix T40224: Crash moving objects to another layer

Incorrect nonnull attribute was optimizing out NULL check.

===================================================================

M	source/blender/blenlib/BLI_string.h

===================================================================

diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h
index b995f25..2cf9047 100644
--- a/source/blender/blenlib/BLI_string.h
+++ b/source/blender/blenlib/BLI_string.h
@@ -56,11 +56,11 @@ char *BLI_str_quoted_substrN(const char *__restrict str, const char *__restrict
 
 char *BLI_replacestrN(const char *__restrict str, const char *__restrict substr_old, const char *__restrict substr_new) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL() ATTR_MALLOC;
 
-size_t BLI_snprintf(char *__restrict dst, size_t maxncpy, const char *__restrict format, ...) ATTR_NONNULL() ATTR_PRINTF_FORMAT(3, 4);
+size_t BLI_snprintf(char *__restrict dst, size_t maxncpy, const char *__restrict format, ...) ATTR_NONNULL(1, 3) ATTR_PRINTF_FORMAT(3, 4);
 
 size_t BLI_vsnprintf(char *__restrict dst, size_t maxncpy, const char *__restrict format, va_list arg) ATTR_PRINTF_FORMAT(3, 0);
 
-char *BLI_sprintfN(const char *__restrict format, ...) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL() ATTR_MALLOC ATTR_PRINTF_FORMAT(1, 2);
+char *BLI_sprintfN(const char *__restrict format, ...) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) ATTR_MALLOC ATTR_PRINTF_FORMAT(1, 2);
 
 size_t BLI_strescape(char *__restrict dst, const char *__restrict src, const size_t maxncpy) ATTR_NONNULL();