diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2004-02-08 13:31:06 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2004-02-08 13:31:06 +0000 |
commit | fcc7c0a7bf8214f5338d0543d1ad4c992d5e9da1 (patch) | |
tree | a6ffa67f727b220fcda9f37ed4e87e905961162a | |
parent | 0faa9d290f38dd487ef0de9beca16dddcd466083 (diff) |
Fix handling of -offset and -length in asn1parse tool.
If -offset exceeds -length of data available exit with an error.
Don't read past end of total data available when -offset supplied.
If -length exceeds total available truncate it.
-rw-r--r-- | apps/asn1pars.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/asn1pars.c b/apps/asn1pars.c index 8cc13ee2d1..4ec6ec2741 100644 --- a/apps/asn1pars.c +++ b/apps/asn1pars.c @@ -301,7 +301,15 @@ bad: num=tmplen; } - if (length == 0) length=(unsigned int)num; + if (offset >= num) + { + BIO_printf(bio_err, "Error: offset too large\n"); + goto end; + } + + num -= offset; + + if ((length == 0) || (length > num)) length=(unsigned int)num; if(derout) { if(BIO_write(derout, str + offset, length) != (int)length) { BIO_printf(bio_err, "Error writing output\n"); |