walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'cubicdaiya-alloc-error-handling'

This commit is contained in:
Tatsuhiro Tsujikawa 2015-04-15 22:45:10 +09:00
parent 5c2ca28706 59f8397659
commit 53bcafb39f
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/comp_helper.c
View File

@ -57,6 +57,9 @@ json_t *dump_header(const uint8_t *name, size_t namelen, const uint8_t *value,
size_t valuelen) { size_t valuelen) {
json_t *nv_pair = json_object(); json_t *nv_pair = json_object();
char *cname = malloc(namelen + 1); char *cname = malloc(namelen + 1);
if (cname == NULL) {
return NULL;
}
memcpy(cname, name, namelen); memcpy(cname, name, namelen);
cname[namelen] = '\0'; cname[namelen] = '\0';
json_object_set_new(nv_pair, cname, json_pack("s#", value, valuelen)); json_object_set_new(nv_pair, cname, json_pack("s#", value, valuelen));

6
src/util.cc
View File

@ -737,10 +737,16 @@ char *get_exec_path(int argc, char **const argv, const char *cwd) {
if (argv0[0] == '/') { if (argv0[0] == '/') {
path = static_cast<char *>(malloc(len + 1)); path = static_cast<char *>(malloc(len + 1));
if (path == nullptr) {
return nullptr;
}
memcpy(path, argv0, len + 1); memcpy(path, argv0, len + 1);
} else { } else {
auto cwdlen = strlen(cwd); auto cwdlen = strlen(cwd);
path = static_cast<char *>(malloc(len + 1 + cwdlen + 1)); path = static_cast<char *>(malloc(len + 1 + cwdlen + 1));
if (path == nullptr) {
return nullptr;
}
memcpy(path, cwd, cwdlen); memcpy(path, cwd, cwdlen);
path[cwdlen] = '/'; path[cwdlen] = '/';
memcpy(path + cwdlen + 1, argv0, len + 1); memcpy(path + cwdlen + 1, argv0, len + 1);