From 504b632c2bbfcc0504034053708dd4b3e914efdf Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sat, 5 Jan 2008 21:47:24 +0000 Subject: [PATCH] update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7102 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/switch_utils.c b/src/switch_utils.c index 8d9319aa63..ce2b02688f 100644 --- a/src/switch_utils.c +++ b/src/switch_utils.c @@ -70,7 +70,7 @@ SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size switch_size_t total = 0; p = buf; - while (total + sizeof(c) < len && (cur = read(fd, &c, sizeof(c))) > 0) { + while (total + 2 < len && (cur = read(fd, &c, 1)) == 1) { total += cur; *p++ = c; if (c == '\r' || c == '\n') { @@ -79,6 +79,7 @@ SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size } *p++ = '\0'; + assert(total < len); return total; }