fixes for VS2010 code analysis - hope these are OK else-ware

This commit is contained in:
Jeff Lenk 2014-05-20 22:54:03 -05:00
parent bedf8327b6
commit e6ac87f5f1
2 changed files with 9 additions and 0 deletions

View File

@ -825,10 +825,12 @@ ESL_DECLARE(esl_status_t) esl_event_serialize(esl_event_t *event, char **str, es
if ((len + llen) > dlen) { if ((len + llen) > dlen) {
char *m; char *m;
char *old = buf;
dlen += (blocksize + (len + llen)); dlen += (blocksize + (len + llen));
if ((m = realloc(buf, dlen))) { if ((m = realloc(buf, dlen))) {
buf = m; buf = m;
} else { } else {
buf = old;
abort(); abort();
} }
} }
@ -852,10 +854,12 @@ ESL_DECLARE(esl_status_t) esl_event_serialize(esl_event_t *event, char **str, es
if ((len + llen) > dlen) { if ((len + llen) > dlen) {
char *m; char *m;
char *old = buf;
dlen += (blocksize + (len + llen)); dlen += (blocksize + (len + llen));
if ((m = realloc(buf, dlen))) { if ((m = realloc(buf, dlen))) {
buf = m; buf = m;
} else { } else {
buf = old;
abort(); abort();
} }
} }

View File

@ -414,6 +414,11 @@ TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cm
*e++ = '\0'; *e++ = '\0';
} }
do { do {
#if (_MSC_VER == 1600)
if (!p) {
break;
}
#endif
if ((next = strchr(p, ',')) != 0) { if ((next = strchr(p, ',')) != 0) {
*next++ = '\0'; *next++ = '\0';
} }