reyk/cloud-agent
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Some small fixes found by @jonathangray with cppcheck/scan-build.

Browse source
This commit is contained in:
Reyk Floeter 2017-06-29 12:48:15 +02:00
commit 2b1181c2ca
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
agent/azure.c
View file

@ -483,7 +483,7 @@ azure_getpubkeys(struct system_config *sc)
FILE *fp; FILE *fp;
int ret = -1; int ret = -1;
FILE *infp = NULL; FILE *infp = NULL;
char *inbuf; char *inbuf = NULL;
size_t inbufsz; size_t inbufsz;
if ((fp = fopen(az->az_certs, "r")) == NULL) { if ((fp = fopen(az->az_certs, "r")) == NULL) {
@ -769,6 +769,7 @@ azure_getendpoint(struct system_config *sc)
if (asprintf(&ep, "%d.%d.%d.%d", if (asprintf(&ep, "%d.%d.%d.%d",
a[0], a[1], a[2], a[3]) == -1) { a[0], a[1], a[2], a[3]) == -1) {
log_debug("%s: asprintf", __func__); log_debug("%s: asprintf", __func__);
fclose(fp);
return (-1); return (-1);
} }
} }

5
agent/main.c
View file

@ -162,6 +162,7 @@ shellout(const char *in, char **out, const char *arg, ...)
} }
free(argv); free(argv);
argv = NULL;
sigaction(SIGINT, NULL, &sigint); sigaction(SIGINT, NULL, &sigint);
sigaction(SIGQUIT, NULL, &sigquit); sigaction(SIGQUIT, NULL, &sigquit);
@ -381,8 +382,10 @@ filein(const char *mode, const char *fmt, ...)
return (NULL); return (NULL);
} }
free(path); free(path);
if ((infp = open_memstream(&inbuf, &inbufsz)) == NULL) if ((infp = open_memstream(&inbuf, &inbufsz)) == NULL) {
fclose(fp); fclose(fp);
return (NULL);
}
while (fgets(buf, sizeof(buf), fp) != NULL) { while (fgets(buf, sizeof(buf), fp) != NULL) {
fputs(buf, infp); fputs(buf, infp);
} }

4
agent/xml.c
View file

@ -235,7 +235,9 @@ xml_end_element(void *data, const char *el)
struct xml *env = data; struct xml *env = data;
struct xmlelem *xe = env->ox_cur; struct xmlelem *xe = env->ox_cur;
if (xe == NULL || strcmp(xe->xe_tag, el) != 0) if (xe == NULL)
fatal("missing element");
if (strcmp(xe->xe_tag, el) != 0)
fatal("unexpected closing tag: %s <> %s", el, xe->xe_tag); fatal("unexpected closing tag: %s <> %s", el, xe->xe_tag);
if (xe->xe_data == NULL) if (xe->xe_data == NULL)
xe->xe_data = strdup(""); xe->xe_data = strdup("");