FIX: Coverity Scan fixes, a bunch of them.

This commit is contained in:
iceman1001
2016-01-16 22:58:44 +01:00
parent 72109f8296
commit e1ad67eaf2
7 changed files with 27 additions and 30 deletions

View File

@@ -592,8 +592,10 @@ mbynam(model_t *dest, const char *key) {
if(!aliases->name)
return(-1);
if(!(ukey = malloc((size_t) 1 + strlen(key))))
if(!(ukey = malloc((size_t) 1 + strlen(key)))) {
uerror("cannot allocate memory for comparison string");
return(0);
}
akey.name = uptr = ukey;
do
*uptr++ = toupper(*key);
@@ -713,12 +715,15 @@ mtostr(const model_t *model) {
void
mmatch(model_t *model, int flags) {
if(!model) return;
/* searches models[] for a model matching the argument, and links a name if found
* if flags & M_OVERWR, copies the found model onto the argument. */
model_t *mptr;
if(!model) return;
mptr = bsearch(model, models, NPRESETS, sizeof(model_t), (int (*)(const void *, const void *)) &mcmp);
if(mptr) {
model->name = mptr->name;
if(flags & M_OVERWR)

View File

@@ -141,8 +141,10 @@ reveng(const model_t *guess, const poly_t qpoly, int rflags, int args, const pol
engini(&resc, &result, guess->spoly, guess->flags, args, argpolys);
requit:
if(!(result = realloc(result, ++resc * sizeof(model_t))))
if(!(result = realloc(result, ++resc * sizeof(model_t)))) {
uerror("cannot reallocate result array");
return NULL;
}
rptr = result + resc - 1;
rptr->spoly = pzero;
rptr->init = pzero;