From b3f7d5fa7ee90461fe0c90987af68150d09d9207 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 9 Jun 2008 18:06:14 +0000 Subject: [PATCH] Build fix. Segfault fix on error from multitags. --- org.glite.jp.primary/src/soap_ops.c | 10 ++++++---- org.glite.lb.state-machine/src/lb_plugin.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/org.glite.jp.primary/src/soap_ops.c b/org.glite.jp.primary/src/soap_ops.c index aaa5ba3..4a3ebdb 100644 --- a/org.glite.jp.primary/src/soap_ops.c +++ b/org.glite.jp.primary/src/soap_ops.c @@ -307,11 +307,13 @@ SOAP_FMAC5 int SOAP_FMAC6 __jpsrv__RecordMultiTags( glite_jpps_match_attr_multi(ctx,(const char **) jobs,(const glite_jp_attrval_t **) attrs); cleanup: - for (i=0; attrs[i]; i++) { - for (j=0; attrs[i][j].name; j++) glite_jp_attrval_free(&attrs[i][j],0); - free(attrs[i]); + if (attrs) { + for (i=0; attrs[i]; i++) { + for (j=0; attrs[i][j].name; j++) glite_jp_attrval_free(&attrs[i][j],0); + free(attrs[i]); + } + free(attrs); } - free(attrs); free(jobs); glite_jp_attrval_free(meta,0); diff --git a/org.glite.lb.state-machine/src/lb_plugin.c b/org.glite.lb.state-machine/src/lb_plugin.c index 2197d41..6d980b8 100644 --- a/org.glite.lb.state-machine/src/lb_plugin.c +++ b/org.glite.lb.state-machine/src/lb_plugin.c @@ -1576,7 +1576,7 @@ static int lb_filecom(void *fpctx, void *handle){ attr[0].timestamp = time(NULL); attr[0].origin_detail = NULL; /* XXX */ attr[1].name = NULL; - glite_jppsbe_append_tag(ctx, edg_wlc_JobIdUnparse(h->status.jobId), attr); + glite_jppsbe_append_tags(ctx, edg_wlc_JobIdUnparse(h->status.jobId), attr); } i++; } -- 1.8.2.3