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.
This commit is contained in:
@@ -304,7 +304,15 @@ bad:
|
|||||||
num=tmplen;
|
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(derout) {
|
||||||
if(BIO_write(derout, str + offset, length) != (int)length) {
|
if(BIO_write(derout, str + offset, length) != (int)length) {
|
||||||
BIO_printf(bio_err, "Error writing output\n");
|
BIO_printf(bio_err, "Error writing output\n");
|
||||||
|
|||||||
Reference in New Issue
Block a user