Merge pull request #508 from werew/develop

sjaeckel · web-flow · commit 64d1153e5a51 · 2019-10-08T09:07:43.000+02:00
Fixes #507
diff --git a/src/pk/asn1/der/utf8/der_decode_utf8_string.c b/src/pk/asn1/der/utf8/der_decode_utf8_string.c
@@ -65,7 +65,7 @@ int der_decode_utf8_string(const unsigned char *in,  unsigned long inlen,
       /* count number of bytes */
       for (z = 0; (tmp & 0x80) && (z <= 4); z++, tmp = (tmp << 1) & 0xFF);
 
-      if (z > 4 || (x + (z - 1) > inlen)) {
+      if (z == 1 || z > 4 || (x + (z - 1) > inlen)) {
          return CRYPT_INVALID_PACKET;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ int der_decode_utf8_string(const unsigned char *in, unsigned long inlen,`
`65`	`65`	`/* count number of bytes */`
`66`	`66`	`for (z = 0; (tmp & 0x80) && (z <= 4); z++, tmp = (tmp << 1) & 0xFF);`
`67`	`67`
`68`		`- if (z > 4 \|\| (x + (z - 1) > inlen)) {`
	`68`	`+ if (z == 1 \|\| z > 4 \|\| (x + (z - 1) > inlen)) {`
`69`	`69`	`return CRYPT_INVALID_PACKET;`
`70`	`70`	`}`
`71`	`71`