Merged revisions 49009 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49009 | file | 2006-12-27 17:28:46 -0500 (Wed, 27 Dec 2006) | 2 lines

ast_copy_string is not available when LOW_MEMORY is used and things are being built in the utils directory, so we need to resort to the old method of strncpy. (issue #8579 reported by mottano)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49010 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c
index 3693e4842153b8d1a5195c3087a32c77c1e5f329..eb4691dc4cca4a3377e9d17dbb71dc6e62a7b292 100644 (file)
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -3134,11 +3134,11 @@ int ast_expr(char *expr, char *buf, int length)
                        res_length = snprintf(buf, length, "%ld", (long int) io.val->u.i);
                        return_value = (res_length <= length) ? res_length : length;
                } else {
-#ifdef STANDALONE
+#if defined(STANDALONE) || defined(LOW_MEMORY)
                        strncpy(buf, io.val->u.s, length - 1);
-#else /* !STANDALONE */
+#else /* !STANDALONE && !LOW_MEMORY */
                        ast_copy_string(buf, io.val->u.s, length);
-#endif /* STANDALONE */
+#endif /* STANDALONE || LOW_MEMORY */
                        return_value = strlen(buf);
                        free(io.val->u.s);
                }

diff --git a/pbx/ael/ael_lex.c b/pbx/ael/ael_lex.c
index e416f6afbdefda7f99eacf38e79597d708da7c72..7468a46bb6ffd529590ba3c6a2ca95224d7e79b3 100644 (file)
--- a/pbx/ael/ael_lex.c
+++ b/pbx/ael/ael_lex.c
@@ -1689,7 +1689,7 @@ YY_RULE_SETUP
                        if (*(p1+1) != '/')
                                snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ast_config_AST_CONFIG_DIR, p1 + 1);
                        else
-#ifdef STANDALONE
+#if defined(STANDALONE) || defined(LOW_MEMORY)
                                strncpy(fnamebuf, p1 + 1, sizeof(fnamebuf) - 1);
 #else
                                ast_copy_string(fnamebuf, p1 + 1, sizeof(fnamebuf));