提交 113a902e authored 作者: Mike Jerris's avatar Mike Jerris

Merge pull request #1046 in FS/freeswitch from ~FRANCOIS/freeswitch-fs-9693:master to master

* commit '7f017fd1':
  FS-9693 fix free issue in fulldate comparison
...@@ -3343,6 +3343,7 @@ SWITCH_DECLARE(int) switch_fulldate_cmp(const char *exp, switch_time_t *ts) ...@@ -3343,6 +3343,7 @@ SWITCH_DECLARE(int) switch_fulldate_cmp(const char *exp, switch_time_t *ts)
char *p; char *p;
switch_time_t tsStart = 0; switch_time_t tsStart = 0;
switch_time_t tsEnd = 0; switch_time_t tsEnd = 0;
int ret = 0;
switch_assert(dup); switch_assert(dup);
...@@ -3358,11 +3359,17 @@ SWITCH_DECLARE(int) switch_fulldate_cmp(const char *exp, switch_time_t *ts) ...@@ -3358,11 +3359,17 @@ SWITCH_DECLARE(int) switch_fulldate_cmp(const char *exp, switch_time_t *ts)
tsStart = switch_str_time(sStart); tsStart = switch_str_time(sStart);
tsEnd = switch_str_time(sEnd); tsEnd = switch_str_time(sEnd);
switch_safe_free(dup);
if (tsStart == 0) return 0;
if (tsEnd == 0) return 0; if (tsStart == 0 || tsEnd == 0) {
if (tsStart <= *ts && tsEnd > *ts) return 1; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse error for date time range (%s~%s)\n", sStart, sEnd);
break;
}
if (tsStart <= *ts && tsEnd > *ts) {
ret = 1;
break;
}
} }
if ((cur = p)) { if ((cur = p)) {
...@@ -3371,8 +3378,9 @@ SWITCH_DECLARE(int) switch_fulldate_cmp(const char *exp, switch_time_t *ts) ...@@ -3371,8 +3378,9 @@ SWITCH_DECLARE(int) switch_fulldate_cmp(const char *exp, switch_time_t *ts)
} }
} }
} }
switch_safe_free(dup); switch_safe_free(dup);
return 0; return ret;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论