浏览代码

more fmemopen null termination fixes

null termination is only added when current size grows.
in update modes, null termination is not added if it does not fit
(i.e. it is not allowed to clobber data).

these rules make very little sense, but that's how it goes..
Rich Felker 13 年之前
父节点
当前提交
d2e061a2bd
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      src/stdio/fmemopen.c

+ 3 - 2
src/stdio/fmemopen.c

@@ -54,9 +54,10 @@ static size_t mwrite(FILE *f, const unsigned char *buf, size_t len)
 	if (len > rem) len = rem;
 	memcpy(c->buf+c->pos, buf, len);
 	c->pos += len;
-	if (c->pos >= c->len) {
+	if (c->pos > c->len) {
 		c->len = c->pos;
-		c->buf[c->len==c->size ? c->len-1 : c->len] = 0;
+		if (c->len < c->size) c->buf[c->len] = 0;
+		else if ((f->flags&F_NORD) && c->size) c->buf[c->size-1] = 0;
 	}
 	return len;
 }