提交 28b3fd02 编写于 作者: O openeuler-ci-bot 提交者: Gitee

!4 isulad: fix code bug

Merge pull request !4 from Grooooot/12.29.1
## Install Dependencies
```sh
$ sudo yum install -y cmake gcc-c++ systemd-devel yajl-devel libcurl libcurl-devel clibcni clibcni-devel protobuf-devel grpc-devel grpc-plugins http-parser-devel libwebsockets-devel libevhtp-devel libevent-devel lcr lxc-devel
```
## Build steps:
Run the cmds under the iSulad source directory
```sh
$ sudo mkdir build
$ sudo cd build
$ sudo cmake ..
$ sudo make
$ sudo make install
```
......@@ -514,9 +514,13 @@ static void set_stderr_buf(char **stderr_buf, const char *format, ...)
va_list argp;
va_start(argp, format);
(void)vsprintf(errbuf, format, argp);
int nret = vsnprintf(errbuf, BUFSIZ, format, argp);
va_end(argp);
if (nret < 0 || nret >= BUFSIZ) {
return;
}
*stderr_buf = json_marshal_string(errbuf, strlen(errbuf), NULL, &jerr);
if (*stderr_buf == NULL) {
*stderr_buf = util_strdup_s(errbuf);
......
......@@ -1190,6 +1190,10 @@ static ssize_t extract_stream_to_io_read(void *content, void *buf, size_t buf_le
DEBUG("Client may exited");
return -1;
}
if (copy.data_len > buf_len) {
free(copy.data);
return -1;
}
(void)memcpy(buf, copy.data, copy.data_len);
free(copy.data);
return (ssize_t)(copy.data_len);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册