VP may be NULL

diff --git a/src/main/xlat.c b/src/main/xlat.c
index 7f4932e90ef33f956456214760304a01db42e39f..0488fdae1cd50e45d54b23a14003d1b7e6f83e26 100644 (file)
--- a/src/main/xlat.c
+++ b/src/main/xlat.c
@@ -115,11 +115,11 @@ static VALUE_PAIR *pairfind_tag(VALUE_PAIR *vps, const DICT_ATTR *da, int tag)
        VALUE_PAIR *vp = vps;
 
 redo:
-       if (!vp) return NULL;
-
        vp = pairfind(vp, da->attr, da->vendor);
        if (!tag) return vp;
 
+       if (!vp) return NULL;
+
        if (!vp->flags.has_tag) return NULL;
 
        if (vp->flags.tag == tag) return vp;
@@ -332,6 +332,8 @@ static size_t xlat_packet(void *instance, REQUEST *request,
                 *      Non-existent array reference.
                 */
        just_print:
+               if (!vp) return 0;
+
                if (do_number) {
                        if ((vp->type != PW_TYPE_IPADDR) &&
                            (vp->type != PW_TYPE_INTEGER) &&
@@ -345,7 +347,6 @@ static size_t xlat_packet(void *instance, REQUEST *request,
                        return snprintf(out, outlen, "%u", vp->vp_integer);
                }
 
-               if (!vp) return 0;
                return valuepair2str(out, outlen, vp, da->type, func);
        }