From 6304d68d1632257bb9b24a07b35e37ee119b42f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 12 Jul 2007 11:57:19 +0000
Subject: [PATCH] try to avoid aliasing of pointers enum {} vs int

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21503 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/asn1/gen_decode.c | 14 ++++++++------
 lib/asn1/gen_encode.c | 12 ++++++------
 lib/asn1/gen_length.c | 11 +++++------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/lib/asn1/gen_decode.c b/lib/asn1/gen_decode.c
index 62edb1cd2..40751cd07 100644
--- a/lib/asn1/gen_decode.c
+++ b/lib/asn1/gen_decode.c
@@ -262,12 +262,14 @@ decode_type (const char *name, const Type *t, int optional,
     }
     case TInteger:
 	if(t->members) {
-	    char *s;
-	    asprintf(&s, "(int*)%s", name);
-	    if (s == NULL)
-		errx (1, "out of memory");
-	    decode_primitive ("integer", s, forwstr);
-	    free(s);
+	    fprintf(codefile,
+		    "{\n"
+		    "int enumint;\n");
+	    decode_primitive ("integer", "&enumint", forwstr);
+	    fprintf(codefile,
+		    "*%s = enumint;\n"
+		    "}\n",
+		    name);
 	} else if (t->range == NULL) {
 	    decode_primitive ("heim_integer", name, forwstr);
 	} else if (t->range->min == INT_MIN && t->range->max == INT_MAX) {
diff --git a/lib/asn1/gen_encode.c b/lib/asn1/gen_encode.c
index ff9c03629..bf26a965a 100644
--- a/lib/asn1/gen_encode.c
+++ b/lib/asn1/gen_encode.c
@@ -121,12 +121,12 @@ encode_type (const char *name, const Type *t, const char *tmpstr)
 	break;
     case TInteger:
 	if(t->members) {
-	    char *s;
-	    asprintf(&s, "(const int*)%s", name);
-	    if(s == NULL)
-		errx(1, "out of memory");
-	    encode_primitive ("integer", s);
-	    free(s);
+	    fprintf(codefile,
+		    "{\n"
+		    "int enumint = (int)*%s;\n",
+		    name);
+	    encode_primitive ("integer", "&enumint");
+	    fprintf(codefile, "}\n;");
 	} else if (t->range == NULL) {
 	    encode_primitive ("heim_integer", name);
 	} else if (t->range->min == INT_MIN && t->range->max == INT_MAX) {
diff --git a/lib/asn1/gen_length.c b/lib/asn1/gen_length.c
index cb57d7fc1..a10604a09 100644
--- a/lib/asn1/gen_length.c
+++ b/lib/asn1/gen_length.c
@@ -72,12 +72,11 @@ length_type (const char *name, const Type *t,
 	break;
     case TInteger:
 	if(t->members) {
-	    char *s;
-	    asprintf(&s, "(const int*)%s", name);
-	    if(s == NULL)
-		errx (1, "out of memory");
-	    length_primitive ("integer", s, variable);
-	    free(s);
+	    fprintf(codefile,
+		    "{\n"
+		    "int enumint = *%s;\n", name);
+	    length_primitive ("integer", "&enumint", variable);
+	    fprintf(codefile, "}\n");
 	} else if (t->range == NULL) {
 	    length_primitive ("heim_integer", name, variable);
 	} else if (t->range->min == INT_MIN && t->range->max == INT_MAX) {