s4:heimdal: import lorikeet-heimdal-201001120029 (commit a5e675fed7c5db8a7370b77ed0bfa724196aa84d)

1 files changed, 16 insertions, 18 deletions

diff --git a/source4/heimdal/lib/asn1/der_get.c b/source4/heimdal/lib/asn1/der_get.c
index 5a062fb339..aee565040f 100644
--- a/source4/heimdal/lib/asn1/der_get.c
+++ b/source4/heimdal/lib/asn1/der_get.c
@@ -305,7 +305,7 @@ der_get_octet_string_ber (const unsigned char *p, size_t len,
 	    void *ptr;
 
 	    ptr = realloc(data->data, data->length + datalen);
-	    if (ptr == NULL && data->length + datalen != 0) {
+	    if (ptr == NULL) {
 		e = ENOMEM;
 		goto out;
 	    }
@@ -354,23 +354,21 @@ der_get_heim_integer (const unsigned char *p, size_t len,
 	    p++;
 	    data->length--;
 	}
-	if (data->length) {
-	    data->data = malloc(data->length);
-	    if (data->data == NULL) {
-		data->length = 0;
-		if (size)
-		    *size = 0;
-		return ENOMEM;
-	    }
-	    q = &((unsigned char*)data->data)[data->length - 1];
-	    p += data->length - 1;
-	    while (q >= (unsigned char*)data->data) {
-		*q = *p ^ 0xff;
-		if (carry)
-		    carry = !++*q;
-		p--;
-		q--;
-	    }
+	data->data = malloc(data->length);
+	if (data->data == NULL) {
+	    data->length = 0;
+	    if (size)
+		*size = 0;
+	    return ENOMEM;
+	}
+	q = &((unsigned char*)data->data)[data->length - 1];
+	p += data->length - 1;
+	while (q >= (unsigned char*)data->data) {
+	    *q = *p ^ 0xff;
+	    if (carry)
+		carry = !++*q;
+	    p--;
+	    q--;
 	}
     } else {
 	data->negative = 0;