oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Check for NUL in the middle of the string

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-08-04 00:57:35 +02:00
parent 0d2e1a1692
commit 147184381e
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/asn1/der_get.c
View File

@@ -200,6 +200,13 @@ der_get_bmp_string (const unsigned char *p, size_t len,
for (i = 0; i < data->length; i++) { for (i = 0; i < data->length; i++) {
data->data[i] = (p[0] << 8) | p[1]; data->data[i] = (p[0] << 8) | p[1];
p += 2; p += 2;
/* check for NUL in the middle of the string */
if (data->data[i] == 0 && i != (data->length - 1)) {
free(data->data);
data->data = NULL;
data->length = 0;
return ASN1_BAD_CHARACTER;
}
} }
if (size) *size = len; if (size) *size = len;
@@ -224,6 +231,13 @@ der_get_universal_string (const unsigned char *p, size_t len,
for (i = 0; i < data->length; i++) { for (i = 0; i < data->length; i++) {
data->data[i] = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; data->data[i] = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
p += 4; p += 4;
/* check for NUL in the middle of the string */
if (data->data[i] == 0 && i != (data->length - 1)) {
free(data->data);
data->data = NULL;
data->length = 0;
return ASN1_BAD_CHARACTER;
}
} }
if (size) *size = len; if (size) *size = len;
return 0; return 0;