Hoping to avoid a crash in OSX for a problem blitzrage found

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

diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl
index 9f2d993afe453187c9346985294e536cae48abb0..8d422ad18eda8568528e6f1849b692e39af7bc29 100644 (file)
--- a/main/ast_expr2.fl
+++ b/main/ast_expr2.fl
@@ -264,13 +264,17 @@ int ast_expr(char *expr, char *buf, int length, struct ast_channel *chan)
                        res_length = snprintf(buf, length, FP___PRINTF, io.val->u.i);
                        return_value = (res_length <= length) ? res_length : length;
                } else {
+                       if (io.val->u.s)
 #if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
-                       strncpy(buf, io.val->u.s, length - 1);
+                               strncpy(buf, io.val->u.s, length - 1);
 #else /* !STANDALONE && !LOW_MEMORY */
-                       ast_copy_string(buf, io.val->u.s, length);
+                               ast_copy_string(buf, io.val->u.s, length);
 #endif /* STANDALONE || LOW_MEMORY */
+                       else
+                               buf[0] = 0;
                        return_value = strlen(buf);
-                       free(io.val->u.s);
+                       if (io.val->u.s)
+                               free(io.val->u.s);
                }
                free(io.val);
        }

diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c
index 243046558ce4fab6bb8918e3a16747a5b724be9d..c9ae8defdd67e4541ae8a94fb8f7a887f3f0fbc8 100644 (file)
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@@ -3207,13 +3207,17 @@ int ast_expr(char *expr, char *buf, int length, struct ast_channel *chan)
                        res_length = snprintf(buf, length, FP___PRINTF, io.val->u.i);
                        return_value = (res_length <= length) ? res_length : length;
                } else {
+                       if (io.val->u.s)
 #if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
-                       strncpy(buf, io.val->u.s, length - 1);
+                               strncpy(buf, io.val->u.s, length - 1);
 #else /* !STANDALONE && !LOW_MEMORY */
-                       ast_copy_string(buf, io.val->u.s, length);
+                               ast_copy_string(buf, io.val->u.s, length);
 #endif /* STANDALONE || LOW_MEMORY */
+                       else
+                               buf[0] = 0;
                        return_value = strlen(buf);
-                       free(io.val->u.s);
+                       if (io.val->u.s)
+                               free(io.val->u.s);
                }
                free(io.val);
        }