Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix coverity resource leaks

This commit is contained in:
Enno Rehling 2017-11-20 16:49:35 +01:00
parent 4fa9e041bf
commit 36809d1f9a
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/kernel/order.c
View File

@ -279,27 +279,13 @@ void close_orders(void) {
} }
} }
static order *create_order_i(order *ord, keyword_t kwd, const char *sptr, bool persistent, static void create_order_i(order *ord, keyword_t kwd, const char *sptr, bool persistent,
bool noerror, const struct locale *lang) bool noerror, const struct locale *lang)
{ {
int lindex; int lindex;
assert(ord); assert(ord);
if (kwd == NOKEYWORD || keyword_disabled(kwd)) { assert(kwd != NOKEYWORD && !keyword_disabled(kwd));
log_error("trying to create an order for disabled keyword %s.", keyword(kwd));
return NULL;
}
/* if this is just nonsense, then we skip it. */
if (lomem) {
switch (kwd) {
case K_KOMMENTAR:
case NOKEYWORD:
return NULL;
default:
break;
}
}
lindex = locale_index(lang); lindex = locale_index(lang);
assert(lindex < MAXLOCALES); assert(lindex < MAXLOCALES);
@ -318,8 +304,6 @@ static order *create_order_i(order *ord, keyword_t kwd, const char *sptr, bool p
while (isspace(*(unsigned char *)sptr)) ++sptr; while (isspace(*(unsigned char *)sptr)) ++sptr;
ord->data = create_data(kwd, sptr, lindex); ord->data = create_data(kwd, sptr, lindex);
return ord;
} }
order *create_order(keyword_t kwd, const struct locale * lang, order *create_order(keyword_t kwd, const struct locale * lang,
@ -377,7 +361,8 @@ order *create_order(keyword_t kwd, const struct locale * lang,
zBuffer[0] = 0; zBuffer[0] = 0;
} }
ord = (order *)malloc(sizeof(order)); ord = (order *)malloc(sizeof(order));
return create_order_i(ord, kwd, zBuffer, false, false, lang); create_order_i(ord, kwd, zBuffer, false, false, lang);
return ord;
} }
order *parse_order(const char *s, const struct locale * lang) order *parse_order(const char *s, const struct locale * lang)
@ -409,7 +394,8 @@ order *parse_order(const char *s, const struct locale * lang)
} }
if (kwd != NOKEYWORD) { if (kwd != NOKEYWORD) {
order *ord = (order *)malloc(sizeof(order)); order *ord = (order *)malloc(sizeof(order));
return create_order_i(ord, kwd, sptr, persistent, noerror, lang); create_order_i(ord, kwd, sptr, persistent, noerror, lang);
return ord;
} }
} }
return NULL; return NULL;