Merge branch 'master' of https://github.com/iceman1001/proxmark3

[proxmark3-svn] / client / reveng / model.c

diff --git a/client/reveng/model.c b/client/reveng/model.c
index 2d45b2fe1f9b29ebaf779bd1a532f504df4a628b..6b346d3534c730434264c8434407e41365533e90 100644 (file)
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -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)