From 4e398e7992ddcd2f8c99e9f9933363c17c8c1640 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 19 Sep 2015 15:30:15 +0200 Subject: [PATCH] Use strlcpy everywhere --- audio/librsound.c | 16 ++++++++-------- libretro-db/query.c | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/audio/librsound.c b/audio/librsound.c index 30f5e3d2bb..2f9b9ceb88 100644 --- a/audio/librsound.c +++ b/audio/librsound.c @@ -363,12 +363,12 @@ static int rsnd_send_header_info(rsound_t *rd) #define LSB16(x) if ( !rsnd_is_little_endian() ) { rsnd_swap_endian_16(&(x)); } #define LSB32(x) if ( !rsnd_is_little_endian() ) { rsnd_swap_endian_32(&(x)); } - // Here we embed in the rest of the WAV header for it to be somewhat valid + /* Here we embed in the rest of the WAV header for it to be somewhat valid */ - strcpy(header, "RIFF"); + strlcpy(header, "RIFF", sizeof(header)); SET32(header, 4, 0); - strcpy(header+8, "WAVE"); - strcpy(header+12, "fmt "); + strlcpy(header+8, "WAVE", sizeof(header)); + strlcpy(header+12, "fmt ", sizeof(header)); temp32 = 16; LSB32(temp32); @@ -414,15 +414,15 @@ static int rsnd_send_header_info(rsound_t *rd) LSB16(temp_bits); SET16(header, FRAMESIZE, temp_bits); - strcpy(header+36, "data"); + strlcpy(header+36, "data", sizeof(header)); - // Do not care about cksize here (impossible to know beforehand). It is used by - // the server for format. + /* Do not care about cksize here (impossible to know beforehand). + * It is used by the server for format. */ LSB16(temp_format); SET16(header, FORMAT, temp_format); - // End static header + /* End static header */ if ( rsnd_send_chunk(rd->conn.socket, header, HEADER_SIZE, 1) != HEADER_SIZE ) { diff --git a/libretro-db/query.c b/libretro-db/query.c index 3b425d6150..2c24adf7bb 100644 --- a/libretro-db/query.c +++ b/libretro-db/query.c @@ -12,6 +12,7 @@ #include "rmsgpack_dom.h" #include +#include #define MAX_ERROR_LEN 256 #define QUERY_MAX_ARGS 50 @@ -134,7 +135,7 @@ static void raise_unknown_function(off_t where, const char *name, if (len < (MAX_ERROR_LEN - n - 3)) strncpy(tmp_error_buff + n, name, len); - strcpy(tmp_error_buff + n + len, "'"); + strlcpy(tmp_error_buff + n + len, "'", sizeof(tmp_error_buff)); *error = tmp_error_buff; } static void raise_expected_eof(off_t where, char found, const char **error)