Optimize: better shortcut evaluation ("Howard Chu" <hyc@highlandsun.com>).

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index cf21ea337772f87e9dcb52f232442fa519350df9..8779ba7d1d4e1e167ceabc298eaa577964e811be 100644 (file)
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -445,8 +445,7 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
                return(0);
        }
 
-       nid=OBJ_obj2nid(a);
-       if ((nid == NID_undef) || no_name) {
+       if (no_name || (nid=OBJ_obj2nid(a)) == NID_undef) {
                len=a->length;
                p=a->data;