diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2022-02-16 12:18:16 +0000 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2022-02-16 14:35:09 +0000 |
| commit | 61714df72f24c852a3a23d96fef0392d3fe9ade2 (patch) | |
| tree | acd3f9f3e1aa7bbf1df6b240bd6f1bab21fae72e /psi/iutil.c | |
| parent | c39ce3b77d8b9e35e02490ac646001f830b7cae5 (diff) | |
| download | ghostpdl-61714df72f24c852a3a23d96fef0392d3fe9ade2.tar.gz | |
Move psi/ files from gs_sprintf to gs_snprintf
Diffstat (limited to 'psi/iutil.c')
| -rw-r--r-- | psi/iutil.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/psi/iutil.c b/psi/iutil.c index ea582e6e2..abaa4a341 100644 --- a/psi/iutil.c +++ b/psi/iutil.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2021 Artifex Software, Inc. +/* Copyright (C) 2001-2022 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -304,7 +304,7 @@ obj_string_data(const gs_memory_t *mem, const ref *op, const byte **pchars, uint * repeatedly to print on a stream, which may require suspending at any * point to handle stream callouts. */ -static void ensure_dot(char *); +static void ensure_dot(char *, size_t); int obj_cvp(const ref * op, byte * str, uint len, uint * prlen, int full_print, uint start_pos, const gs_memory_t *mem, bool restart) @@ -340,15 +340,15 @@ obj_cvp(const ref * op, byte * str, uint len, uint * prlen, */ float value = op->value.realval; float scanned; - code = gs_sprintf(buf, "%g", value); + code = gs_snprintf(buf, sizeof(buf), "%g", value); if (code <= 0) return_error(gs_error_undefinedresult); code = sscanf(buf, "%f", &scanned); if (code <= 0) return_error(gs_error_undefinedresult); if (scanned != value) - gs_sprintf(buf, "%.9g", value); - ensure_dot(buf); + gs_snprintf(buf, sizeof(buf), "%.9g", value); + ensure_dot(buf, 256); goto rs; } case t_operator: @@ -502,7 +502,7 @@ other: data = (const byte *)(op->value.boolval ? "true" : "false"); break; case t_integer: - gs_sprintf(buf, "%"PRIpsint, op->value.intval); + gs_snprintf(buf, sizeof(buf), "%"PRIpsint, op->value.intval); break; case t_string: check_read(*op); @@ -537,7 +537,7 @@ other: break; } /* Internal operator, no name. */ - gs_sprintf(buf, "@"PRI_INTPTR, (intptr_t) op->value.opproc); + gs_snprintf(buf, sizeof(buf), "@"PRI_INTPTR, (intptr_t) op->value.opproc); break; } case t_real: @@ -548,11 +548,11 @@ other: * library implementation. Work around this here. */ if (op->value.realval == (float)0.0001) { - strcpy(buf, "0.0001"); + strncpy(buf, "0.0001", 256); } else { - gs_sprintf(buf, "%g", op->value.realval); + gs_snprintf(buf, sizeof(buf), "%g", op->value.realval); } - ensure_dot(buf); + ensure_dot(buf, 256); break; default: data = (const byte *)"--nostringval--"; @@ -573,17 +573,18 @@ nl: if (size < start_pos) * Re-format the exponent to satisfy Genoa CET test. */ static void -ensure_dot(char *buf) +ensure_dot(char *buf, size_t buflen) { char *pe = strchr(buf, 'e'); if (pe) { int i; (void)sscanf(pe + 1, "%d", &i); + buflen -= (size_t)(pe - buf) /* MSVC .net 2005 express doesn't support "%+02d" */ if (i >= 0) - gs_sprintf(pe + 1, "+%02d", i); + gs_snprintf(pe + 1, buflen, "+%02d", i); else - gs_sprintf(pe + 1, "-%02d", -i); + gs_snprintf(pe + 1, buflen, "-%02d", -i); } else if (strchr(buf, '.') == NULL) { strcat(buf, ".0"); } |