summaryrefslogtreecommitdiff
path: root/include/m_string.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-07 19:17:37 +0100
committerSergei Golubchik <serg@mariadb.org>2017-03-10 18:21:29 +0100
commit5d40ed864eb91314c894c713cd0d3d03c62ec8c5 (patch)
tree597eab3f29343ffb834b8a9f4e5a54f4be56212d /include/m_string.h
parente0a03ca30aa6f91daf7ea519a57d85e54dc49927 (diff)
downloadmariadb-git-5d40ed864eb91314c894c713cd0d3d03c62ec8c5.tar.gz
MDEV-11752 Unsafe strmov - function definition in include/m_string.h
assert that strmov() cannot be used on overlapping strings. (because strpcpy cannot)
Diffstat (limited to 'include/m_string.h')
-rw-r--r--include/m_string.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/m_string.h b/include/m_string.h
index 969725e4631..7437ea8b7cd 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -73,11 +73,13 @@ extern void *(*my_str_malloc)(size_t);
extern void *(*my_str_realloc)(void *, size_t);
extern void (*my_str_free)(void *);
+#ifdef DBUG_OFF
#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) && !defined(__INTEL_COMPILER)
#define strmov(A,B) __builtin_stpcpy((A),(B))
#elif defined(HAVE_STPCPY)
#define strmov(A,B) stpcpy((A),(B))
#endif
+#endif
/* Declared in int2str() */
extern const char _dig_vec_upper[];