[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] ftbench-gsoc-goksu 4ba545d1: Replace `sprintf` with `s
From: |
Werner Lemberg |
Subject: |
[freetype2-demos] ftbench-gsoc-goksu 4ba545d1: Replace `sprintf` with `snprintf`. |
Date: |
Tue, 23 May 2023 07:22:31 -0400 (EDT) |
branch: ftbench-gsoc-goksu
commit 4ba545d1c04b6d84d6b39810cf0e405f33d57880
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>
Replace `sprintf` with `snprintf`.
* graph/x11/grx11.c (main), graph/xtest.c (main): Do it.
* src/ftsdf.c (BUFSIZE): New macro.
(write_header): Use `snprintf`.
* src/ftstring.c (write_header): Ditto.
* src/rsvg-port.c (rsvg_port_preset_slot): Ditto.
---
graph/x11/grx11.c | 2 +-
graph/xtest.c | 2 +-
src/ftsdf.c | 54 +++++++++++++++++++++++++++++++-----------------------
src/ftstring.c | 2 +-
src/rsvg-port.c | 2 +-
5 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/graph/x11/grx11.c b/graph/x11/grx11.c
index ca274922..f90e5be8 100644
--- a/graph/x11/grx11.c
+++ b/graph/x11/grx11.c
@@ -1586,7 +1586,7 @@
if ( !kname )
{
- sprintf( kname_temp, "char '%c'", (char)event.key );
+ snprintf( kname_temp, 16, "char '%c'", (char)event.key );
kname = kname_temp;
}
diff --git a/graph/xtest.c b/graph/xtest.c
index 7bc806be..7b37521b 100644
--- a/graph/xtest.c
+++ b/graph/xtest.c
@@ -110,7 +110,7 @@ int main( void )
if (!kname)
{
- sprintf( kname_temp, "char '%c'", (char)event.key );
+ snprintf( kname_temp, 16, "char '%c'", (char)event.key );
kname = kname_temp;
}
diff --git a/src/ftsdf.c b/src/ftsdf.c
index 41a1cd92..3f2b386d 100644
--- a/src/ftsdf.c
+++ b/src/ftsdf.c
@@ -27,6 +27,9 @@
typedef FT_BBox Box;
+#define BUFSIZE 512
+
+
#define FT_CALL( X ) \
do \
{ \
@@ -219,46 +222,51 @@
static void
write_header( void )
{
- static char header_string[512];
+ static char header_string[BUFSIZE];
- sprintf( header_string,
- "Glyph Index: %d, Pt Size: %d, Spread: %d, Scale: %u",
- status.glyph_index,
- status.ptsize,
- status.spread,
- status.scale );
+ snprintf( header_string,
+ BUFSIZE,
+ "Glyph Index: %d, Pt Size: %d, Spread: %d, Scale: %u",
+ status.glyph_index,
+ status.ptsize,
+ status.spread,
+ status.scale );
grWriteCellString( display->bitmap, 0, 0,
header_string, display->fore_color );
- sprintf( header_string,
- "Position Offset: %d,%d",
- status.x_offset,
- status.y_offset );
+ snprintf( header_string,
+ BUFSIZE,
+ "Position Offset: %d,%d",
+ status.x_offset,
+ status.y_offset );
grWriteCellString( display->bitmap, 0, 1 * HEADER_HEIGHT,
header_string, display->fore_color );
- sprintf( header_string,
- "SDF Generated in: %.0f ms, From: %s",
- (double)status.generation_time,
- status.use_bitmap ? "Bitmap" : "Outline" );
+ snprintf( header_string,
+ BUFSIZE,
+ "SDF Generated in: %.0f ms, From: %s",
+ (double)status.generation_time,
+ status.use_bitmap ? "Bitmap" : "Outline" );
grWriteCellString( display->bitmap, 0, 2 * HEADER_HEIGHT,
header_string, display->fore_color );
- sprintf( header_string,
- "Filtering: %s, View: %s",
- status.nearest_filtering ? "Nearest" : "Bilinear",
- status.reconstruct ? "Reconstructing": "Raw" );
+ snprintf( header_string,
+ BUFSIZE,
+ "Filtering: %s, View: %s",
+ status.nearest_filtering ? "Nearest" : "Bilinear",
+ status.reconstruct ? "Reconstructing": "Raw" );
grWriteCellString( display->bitmap, 0, 3 * HEADER_HEIGHT,
header_string, display->fore_color );
if ( status.reconstruct )
{
/* Only print these in reconstruction mode. */
- sprintf( header_string,
- "Width: %.2f, Edge: %.2f",
- (double)status.width,
- (double)status.edge );
+ snprintf( header_string,
+ BUFSIZE,
+ "Width: %.2f, Edge: %.2f",
+ (double)status.width,
+ (double)status.edge );
grWriteCellString( display->bitmap, 0, 4 * HEADER_HEIGHT,
header_string, display->fore_color );
}
diff --git a/src/ftstring.c b/src/ftstring.c
index 55a2b042..313b108a 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -669,7 +669,7 @@
-1, error_code );
/* describe kerning */
- x = sprintf( kern, "%s pairs, %s track",
+ x = snprintf( kern, 40, "%s pairs, %s track",
sc->kerning_mode == KERNING_MODE_SMART ? "adjusted" :
sc->kerning_mode == KERNING_MODE_NORMAL ? "" : "no",
sc->kerning_degree == KERNING_DEGREE_TIGHT ? "tight" :
diff --git a/src/rsvg-port.c b/src/rsvg-port.c
index 12862580..3d52821c 100644
--- a/src/rsvg-port.c
+++ b/src/rsvg-port.c
@@ -319,7 +319,7 @@
/* Render only the element with its ID equal to `glyph<ID>`. */
- sprintf( str + 6, "%u", slot->glyph_index );
+ snprintf( str + 6, 32 - 6, "%u", slot->glyph_index );
ret = rsvg_handle_render_cairo_sub( handle, rec_cr, str );
if ( ret == FALSE )
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] ftbench-gsoc-goksu 4ba545d1: Replace `sprintf` with `snprintf`.,
Werner Lemberg <=