s4:heimdal: import lorikeet-heimdal-201009250123 (commit 42cabfb5b683dbcb97d583c397b8...

[samba.git] / source4 / heimdal / lib / asn1 / asn1parse.y

diff --git a/source4/heimdal/lib/asn1/asn1parse.y b/source4/heimdal/lib/asn1/asn1parse.y
index 13b86b17c1e68cb007ae68904bc68a564c443ed4..611c5b521ad906a6260edbeb59264f38b3af9319 100644 (file)
--- a/source4/heimdal/lib/asn1/asn1parse.y
+++ b/source4/heimdal/lib/asn1/asn1parse.y
@@ -1007,7 +1007,8 @@ static void fix_labels1(struct memhead *members, const char *prefix)
     if(members == NULL)
        return;
     ASN1_TAILQ_FOREACH(m, members, members) {
-       asprintf(&m->label, "%s_%s", prefix, m->gen_name);
+       if (asprintf(&m->label, "%s_%s", prefix, m->gen_name) < 0)
+           errx(1, "malloc");
        if (m->label == NULL)
            errx(1, "malloc");
        if(m->type != NULL)
@@ -1024,9 +1025,8 @@ static void fix_labels2(Type *t, const char *prefix)
 static void
 fix_labels(Symbol *s)
 {
-    char *p;
-    asprintf(&p, "choice_%s", s->gen_name);
-    if (p == NULL)
+    char *p = NULL;
+    if (asprintf(&p, "choice_%s", s->gen_name) < 0 || p == NULL)
        errx(1, "malloc");
     fix_labels2(s->type, p);
     free(p);