aboutsummaryrefslogtreecommitdiffstats
path: root/src/player.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-03-27 02:52:59 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-03-27 02:52:59 +0000
commit53f728a0aec357f22f04af2d8cceccac8ff4237b (patch)
treed9155666d0311bb103fe564aff7ba935489b5322 /src/player.c
parent12d19cccd284457be9f5be8fcdac5b9d9b894b3f (diff)
downloadmpd-53f728a0aec357f22f04af2d8cceccac8ff4237b.tar.gz
mpd-53f728a0aec357f22f04af2d8cceccac8ff4237b.tar.xz
mpd-53f728a0aec357f22f04af2d8cceccac8ff4237b.zip
just to be carfile, make sure to null terminate when using strncpy
git-svn-id: https://svn.musicpd.org/mpd/trunk@506 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/player.c')
-rw-r--r--src/player.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/player.c b/src/player.c
index 1685837fa..19693c2c3 100644
--- a/src/player.c
+++ b/src/player.c
@@ -182,6 +182,7 @@ int playerPlay(FILE * fp, char * utf8file) {
struct stat st;
if(stat(rmp2amp(utf8ToFsCharset(utf8file)),&st)<0) {
strncpy(pc->erroredFile,pc->file,MAXPATHLEN);
+ pc->erroredFile[MAXPATHLEN] = '\0';
pc->error = PLAYER_ERROR_FILENOTFOUND;
return 0;
}
@@ -190,12 +191,14 @@ int playerPlay(FILE * fp, char * utf8file) {
decodeType = playerGetDecodeType(utf8file);
if(decodeType < 0) {
strncpy(pc->erroredFile,pc->file,MAXPATHLEN);
+ pc->erroredFile[MAXPATHLEN] = '\0';
pc->error = PLAYER_ERROR_UNKTYPE;
return 0;
}
pc->decodeType = decodeType;
strncpy(pc->file,rmp2amp(utf8ToFsCharset(utf8file)),MAXPATHLEN);
+ pc->file[MAXPATHLEN] = '\0';
pc->play = 1;
if(player_pid==0 && playerInit()<0) {
@@ -327,6 +330,7 @@ int queueSong(char * utf8file) {
if(pc->queueState==PLAYER_QUEUE_BLANK) {
strncpy(pc->file,rmp2amp(utf8ToFsCharset(utf8file)),MAXPATHLEN);
+ pc->file[MAXPATHLEN] = '\0';
decodeType = playerGetDecodeType(utf8file);
if(decodeType < 0) return -1;
@@ -393,6 +397,7 @@ int playerSeek(FILE * fp, char * utf8file, float time) {
pc->decodeType = decodeType;
strncpy(pc->file,file,MAXPATHLEN);
+ pc->file[MAXPATHLEN] = '\0';
}
if(pc->error==PLAYER_ERROR_NOERROR) {