diff options
| author | Mark Spencer <markster@digium.com> | 2005-06-17 00:33:00 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2005-06-17 00:33:00 +0000 |
| commit | 10542f614569a7c14a2018d98877f9e898edaabf (patch) | |
| tree | d9fc14eb7b148abc23b71e1984a566e24cd9bc7e /ast_expr2.y | |
| parent | e0f057820a20d7a6b9d1ff18b0e480886673bf4e (diff) | |
Fix expression handling for string comparisions without quotes (bug #4478)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5919 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'ast_expr2.y')
| -rwxr-xr-x | ast_expr2.y | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ast_expr2.y b/ast_expr2.y index 14c84e856..dc0a37528 100755 --- a/ast_expr2.y +++ b/ast_expr2.y @@ -296,10 +296,11 @@ to_integer (struct val *vp) /* vp->type == AST_EXPR_numeric_string, make it numeric */ errno = 0; - i = strtoq(vp->u.s, (char**)NULL, 10); + i = strtoll(vp->u.s, (char**)NULL, 10); if (errno != 0) { + ast_log(LOG_WARNING,"Conversion of %s to integer under/overflowed!\n", vp->u.s); free(vp->u.s); - ast_log(LOG_WARNING,"overflow\n"); + vp->u.s = 0; return(0); } free (vp->u.s); @@ -433,8 +434,15 @@ op_eq (struct val *a, struct val *b) to_string (b); r = make_integer ((quad_t)(strcoll (a->u.s, b->u.s) == 0)); } else { +#ifdef DEBUG_FOR_CONVERSIONS + char buffer[2000]; + sprintf(buffer,"Converting '%s' and '%s' ", a->u.s, b->u.s); +#endif (void)to_integer(a); (void)to_integer(b); +#ifdef DEBUG_FOR_CONVERSIONS + ast_log(LOG_WARNING,"%s to '%lld' and '%lld'\n", buffer, a->u.i, b->u.i); +#endif r = make_integer ((quad_t)(a->u.i == b->u.i)); } |