More (v)snprintf-related buffer over-allocations removed
Also took out an unnecessary memset in getPlayerErrorStr git-svn-id: https://svn.musicpd.org/mpd/trunk@5396 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
772dc6bc66
commit
658b8f53df
@ -68,7 +68,7 @@ static const char *log_date(void)
|
|||||||
#define BUFFER_LENGTH 4096
|
#define BUFFER_LENGTH 4096
|
||||||
static void buffer_warning(const char *fmt, va_list args)
|
static void buffer_warning(const char *fmt, va_list args)
|
||||||
{
|
{
|
||||||
char buffer[BUFFER_LENGTH + 1];
|
char buffer[BUFFER_LENGTH];
|
||||||
char *tmp = buffer;
|
char *tmp = buffer;
|
||||||
size_t len = BUFFER_LENGTH;
|
size_t len = BUFFER_LENGTH;
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ static void blockingWrite(const int fd, const char *string, size_t len)
|
|||||||
|
|
||||||
void vfdprintf(const int fd, const char *fmt, va_list args)
|
void vfdprintf(const int fd, const char *fmt, va_list args)
|
||||||
{
|
{
|
||||||
static char buffer[BUFFER_LENGTH + 1];
|
static char buffer[BUFFER_LENGTH];
|
||||||
char *buf = buffer;
|
char *buf = buffer;
|
||||||
size_t len;
|
size_t len;
|
||||||
|
|
||||||
|
@ -303,8 +303,8 @@ char *getPlayerErrorStr(void)
|
|||||||
int errorlen = MAXPATHLEN + 1024;
|
int errorlen = MAXPATHLEN + 1024;
|
||||||
PlayerControl *pc = &(getPlayerData()->playerControl);
|
PlayerControl *pc = &(getPlayerData()->playerControl);
|
||||||
|
|
||||||
error = xrealloc(error, errorlen + 1);
|
error = xrealloc(error, errorlen);
|
||||||
memset(error, 0, errorlen + 1);
|
error[0] = '\0';
|
||||||
|
|
||||||
switch (pc->error) {
|
switch (pc->error) {
|
||||||
case PLAYER_ERROR_FILENOTFOUND:
|
case PLAYER_ERROR_FILENOTFOUND:
|
||||||
|
Loading…
Reference in New Issue
Block a user