diff options
| author | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:24:08 +0900 |
|---|---|---|
| committer | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:25:02 +0900 |
| commit | 8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8 (patch) | |
| tree | 81f0750d91aa467df3ee81cf30d22a65db2e6685 /ares__read_line.c | |
| parent | ccccebb78520ec3a26a18370936516b12ae5d53a (diff) | |
| parent | 45e88a8337839e5fd88519bc55467053d521c9f6 (diff) | |
| download | c-ares-8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8.tar.gz c-ares-8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8.tar.bz2 c-ares-8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8.zip | |
Merge branch 'tizen' into tizen_basetizen_4.0.m2_releasetizen_4.0.IoT.p1_releasesubmit/tizen_base/20170705.023439submit/tizen_base/20170703.013654submit/tizen_4.0_base/20170828.000001submit/tizen_4.0_base/20170828.000000submit/tizen_4.0_base/20170811.071500accepted/tizen/base/20170707.183634accepted/tizen/4.0/base/20170828.221324accepted/tizen/4.0/base/20170811.093019
Conflicts:
packaging/c-ares.spec
Change-Id: I1ec10e394aed3ef19ee21fefbe3aba7d7a615c74
Diffstat (limited to 'ares__read_line.c')
| -rw-r--r-- | ares__read_line.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ares__read_line.c b/ares__read_line.c index bd9504f..c62ad2a 100644 --- a/ares__read_line.c +++ b/ares__read_line.c @@ -36,7 +36,7 @@ int ares__read_line(FILE *fp, char **buf, size_t *bufsize) if (*buf == NULL) { - *buf = malloc(128); + *buf = ares_malloc(128); if (!*buf) return ARES_ENOMEM; *bufsize = 128; @@ -59,9 +59,13 @@ int ares__read_line(FILE *fp, char **buf, size_t *bufsize) continue; /* Allocate more space. */ - newbuf = realloc(*buf, *bufsize * 2); + newbuf = ares_realloc(*buf, *bufsize * 2); if (!newbuf) - return ARES_ENOMEM; + { + ares_free(*buf); + *buf = NULL; + return ARES_ENOMEM; + } *buf = newbuf; *bufsize *= 2; } |