TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prevent segfault in case we hit an empty sequence

Browse Source
This commit is contained in:
Steffen Jaeckel 2015-09-10 19:17:42 +02:00
parent d4945ac521
commit 16f397d55c
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pk/asn1/der/sequence/der_decode_sequence_flexi.c
View File

@ -361,8 +361,11 @@ int der_decode_sequence_flexi(const unsigned char *in, unsigned long *inlen, ltc
/* len update */ /* len update */
totlen += data_offset; totlen += data_offset;
/* link them up y0 */ /* the flexi decoder can also do nothing, so make sure a child has been allocated */
l->child->parent = l; if (l->child) {
/* link them up y0 */
l->child->parent = l;
}
break; break;
@ -398,12 +401,15 @@ int der_decode_sequence_flexi(const unsigned char *in, unsigned long *inlen, ltc
outside: outside:
/* rewind l please */ /* in case we processed anything */
while (l->prev != NULL || l->parent != NULL) { if (totlen) {
if (l->parent != NULL) { /* rewind l please */
l = l->parent; while (l->prev != NULL || l->parent != NULL) {
} else { if (l->parent != NULL) {
l = l->prev; l = l->parent;
} else {
l = l->prev;
}
} }
} }