Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
wgtpkg-unit: Fix Segmentation fault
[src/app-framework-main.git]
/
src
/
wgtpkg-unit.c
diff --git
a/src/wgtpkg-unit.c
b/src/wgtpkg-unit.c
index
cca718f
..
9f14346
100644
(file)
--- a/
src/wgtpkg-unit.c
+++ b/
src/wgtpkg-unit.c
@@
-382,10
+382,14
@@
static int add_metadata(struct json_object *jdesc, const struct unitconf *conf)
n = json_object_array_length(targets);
for (i = 0 ; i < n ; i++) {
targ = json_object_array_get_idx(targets, i);
n = json_object_array_length(targets);
for (i = 0 ; i < n ; i++) {
targ = json_object_array_get_idx(targets, i);
- port = conf->port();
- if (port < 0)
- return port;
- sprintf(portstr, "%d", port);
+ if (!conf->port)
+ strcpy(portstr, "0");
+ else {
+ port = conf->port ? conf->port() : 0;
+ if (port < 0)
+ return port;
+ sprintf(portstr, "%d", port);
+ }
if (!j_add_string_m(targ, "#metatarget.http-port", portstr))
return -1;
}
if (!j_add_string_m(targ, "#metatarget.http-port", portstr))
return -1;
}