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

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 4d82378b9db1cc091556c1e4f3c47a0f03e0bb9c..d802c4d09cdfc294f3b9c43ee4f284a04e9c6e0b 100644 (file)
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -437,8 +437,7 @@ int OBJ_obj2txt(char *buf, int buf_len, 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;