diff options
author | beck <> | 2014-05-30 02:50:10 +0000 |
---|---|---|
committer | beck <> | 2014-05-30 02:50:10 +0000 |
commit | 50df74c1961eaed1e88ea9c7bb4cfcab77d75043 (patch) | |
tree | 6f84a2ff1282a919b48730c6cb1ad02eb283e68d /src | |
parent | 87b68614d416f49648e9875c68ed29d88682ad81 (diff) | |
download | openbsd-50df74c1961eaed1e88ea9c7bb4cfcab77d75043.tar.gz openbsd-50df74c1961eaed1e88ea9c7bb4cfcab77d75043.tar.bz2 openbsd-50df74c1961eaed1e88ea9c7bb4cfcab77d75043.zip |
Don't write out more than we have allocated in obj_txt, as the glory
that is OBJ_obj2txt() can return a larger value..
ok tedu@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/ts/ts_lib.c | 3 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/ts/ts_lib.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libcrypto/ts/ts_lib.c b/src/lib/libcrypto/ts/ts_lib.c index 81a5f23cd5..b9d92a3012 100644 --- a/src/lib/libcrypto/ts/ts_lib.c +++ b/src/lib/libcrypto/ts/ts_lib.c | |||
@@ -92,9 +92,10 @@ TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj) | |||
92 | char obj_txt[128]; | 92 | char obj_txt[128]; |
93 | 93 | ||
94 | int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0); | 94 | int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0); |
95 | if (len >= sizeof(obj_txt)) | ||
96 | len = sizeof(obj_txt) - 1; | ||
95 | BIO_write(bio, obj_txt, len); | 97 | BIO_write(bio, obj_txt, len); |
96 | BIO_write(bio, "\n", 1); | 98 | BIO_write(bio, "\n", 1); |
97 | |||
98 | return 1; | 99 | return 1; |
99 | } | 100 | } |
100 | 101 | ||
diff --git a/src/lib/libssl/src/crypto/ts/ts_lib.c b/src/lib/libssl/src/crypto/ts/ts_lib.c index 81a5f23cd5..b9d92a3012 100644 --- a/src/lib/libssl/src/crypto/ts/ts_lib.c +++ b/src/lib/libssl/src/crypto/ts/ts_lib.c | |||
@@ -92,9 +92,10 @@ TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj) | |||
92 | char obj_txt[128]; | 92 | char obj_txt[128]; |
93 | 93 | ||
94 | int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0); | 94 | int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0); |
95 | if (len >= sizeof(obj_txt)) | ||
96 | len = sizeof(obj_txt) - 1; | ||
95 | BIO_write(bio, obj_txt, len); | 97 | BIO_write(bio, obj_txt, len); |
96 | BIO_write(bio, "\n", 1); | 98 | BIO_write(bio, "\n", 1); |
97 | |||
98 | return 1; | 99 | return 1; |
99 | } | 100 | } |
100 | 101 | ||