From f187d32a4a600d85128299a178b05d99d019b1ba Mon Sep 17 00:00:00 2001 From: acalcutt Date: Sat, 4 Jan 2025 02:27:30 -0500 Subject: [PATCH] codeql --- src/serve_font.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/serve_font.js b/src/serve_font.js index dea3f07..3b8b68f 100644 --- a/src/serve_font.js +++ b/src/serve_font.js @@ -30,13 +30,6 @@ export async function serve_font(options, allowedFonts, programOpts) { * @returns {Promise} */ app.get('/fonts/:fontstack/:range.pbf', async (req, res) => { - if (verbose) { - console.log( - `Handling font request for: /fonts/%s/%s.pbf`, - req.params.fontstack, - req.params.range, - ); - } let fontstack = req.params.fontstack; const fontStackParts = fontstack.split(','); const sanitizedFontStack = fontStackParts @@ -53,6 +46,13 @@ export async function serve_font(options, allowedFonts, programOpts) { let range = req.params.range; const rangeMatch = range?.match(/^[\d-]+$/); const sanitizedRange = rangeMatch?.[0] || 'invalid'; + if (verbose) { + console.log( + `Handling font request for: /fonts/%s/%s.pbf`, + sanitizedFontStack, + sanitizedRange, + ); + } try { const concatenated = await getFontsPbf( @@ -70,7 +70,7 @@ export async function serve_font(options, allowedFonts, programOpts) { console.error( `Error serving font: %s/%s.pbf, Error: %s`, fontstack, - sanitizedRange, + String(range), String(err), ); return res