]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
librpc:ndr:keycredlink fix CID 1660828 master
authorGary Lockyer <gary@catalyst.net.nz>
Thu, 31 Jul 2025 19:58:52 +0000 (07:58 +1200)
committerAnoop C S <anoopcs@samba.org>
Fri, 1 Aug 2025 14:21:17 +0000 (14:21 +0000)
Fixes:

*** CID 1660828:         Control flow issues  (UNREACHABLE)
/librpc/ndr/ndr_keycredlink.c: 752             in pull_DER_RSA_KEY()
746      goto out;
747      }
748      if (!asn1_end_tag(asn)) { /* PublicKeyInfo */
749      return ndr_pull_error(ndr,
750            NDR_ERR_UNREAD_BYTES,
751            "ASN1 element PublicKeyInfo");
>>>     CID 1660828:         Control flow issues  (UNREACHABLE)
>>>     This code cannot be reached: "goto out;".
752      goto out;
753      }

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Anoop C S <anoopcs@samba.org>
Autobuild-User(master): Anoop C S <anoopcs@samba.org>
Autobuild-Date(master): Fri Aug  1 14:21:17 UTC 2025 on atb-devel-224

librpc/ndr/ndr_keycredlink.c

index 2222e3bf666b613e5688a720e1989b2d80b848ea..286236060c4b262bab5b1247f3b3757d39b93e99 100644 (file)
@@ -746,9 +746,9 @@ static enum ndr_err_code pull_DER_RSA_KEY(struct ndr_pull *ndr,
                goto out;
        }
        if (!asn1_end_tag(asn)) { /* PublicKeyInfo */
-               return ndr_pull_error(ndr,
-                                     NDR_ERR_UNREAD_BYTES,
-                                     "ASN1 element PublicKeyInfo");
+               ret = ndr_pull_error(ndr,
+                                    NDR_ERR_UNREAD_BYTES,
+                                    "ASN1 element PublicKeyInfo");
                goto out;
        }