diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2013-06-26 13:48:31 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2013-06-26 13:49:05 +0200 |
| commit | c6764044e9cd9e1fd0817448bd43bc77d06eba23 (patch) | |
| tree | 91e1f59ad7a953d11003f54b328689f308e9b961 /source/pdf/pdf-pkcs7.c | |
| parent | a9e56e9f94515c109a912a50b4bc80466a11b075 (diff) | |
| download | mupdf-c6764044e9cd9e1fd0817448bd43bc77d06eba23.tar.xz | |
Silence compiler warnings.
Diffstat (limited to 'source/pdf/pdf-pkcs7.c')
| -rw-r--r-- | source/pdf/pdf-pkcs7.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/source/pdf/pdf-pkcs7.c b/source/pdf/pdf-pkcs7.c index 1bc50b6e..b2f6a348 100644 --- a/source/pdf/pdf-pkcs7.c +++ b/source/pdf/pdf-pkcs7.c @@ -220,7 +220,7 @@ static int pk7_verify(X509_STORE *cert_store, PKCS7 *p7, BIO *detached, char *eb { /* there are no signatures on this data */ res = 0; - strncpy(ebuf, "No signatures", sizeof(ebuf)); + fz_strlcpy(ebuf, "No signatures", ebufsize); goto exit; } @@ -235,16 +235,14 @@ static int pk7_verify(X509_STORE *cert_store, PKCS7 *p7, BIO *detached, char *eb if (rc <= 0) { - strncpy(ebuf, ERR_error_string(ERR_get_error(), tbuf), ebufsize-1); + fz_strlcpy(ebuf, ERR_error_string(ERR_get_error(), tbuf), ebufsize); } else { /* Error while checking the certificate chain */ - snprintf(ebuf, ebufsize-1, "%s(%d): %s", X509_verify_cert_error_string(vctx.err), vctx.err, vctx.certdesc); + snprintf(ebuf, ebufsize, "%s(%d): %s", X509_verify_cert_error_string(vctx.err), vctx.err, vctx.certdesc); } - ebuf[ebufsize-1] = 0; - res = 0; goto exit; } @@ -368,7 +366,7 @@ int pdf_check_signature(fz_context *ctx, pdf_document *doc, pdf_widget *widget, else { res = 0; - strncpy(ebuf, "Not signed", ebufsize); + fz_strlcpy(ebuf, "Not signed", ebufsize); } } @@ -379,7 +377,7 @@ int pdf_check_signature(fz_context *ctx, pdf_document *doc, pdf_widget *widget, fz_catch(ctx) { res = 0; - strncpy(ebuf, fz_caught_message(ctx), ebufsize); + fz_strlcpy(ebuf, fz_caught_message(ctx), ebufsize); } if (ebufsize > 0) @@ -392,8 +390,7 @@ int pdf_check_signature(fz_context *ctx, pdf_document *doc, pdf_widget *widget, int pdf_check_signature(fz_context *ctx, pdf_document *doc, pdf_widget *widget, char *file, char *ebuf, int ebufsize) { - strncpy(ebuf, "This version of MuPDF was built without signature support", ebufsize); - + fz_strlcpy(ebuf, "This version of MuPDF was built without signature support", ebufsize); return 0; } |