devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

[coverity] playlist.c pl_save_update_control fix rest of potential fd leaks

Browse source 
Change-Id: I65a8ac6a2ce68c5fd3cde570c3ff1b2e737d911d
This commit is contained in:
William Wilgus 2024-06-04 17:18:30 -04:00
parent dad01f29ff
commit 1b7d35126b
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
apps/playlist.c
View file

@ -3894,7 +3894,7 @@ static int pl_save_update_control(struct playlist_info* playlist,
char *tmpbuf, size_t tmpsize) char *tmpbuf, size_t tmpsize)
{ {
int old_fd; int old_fd;
int err; int err = 0;
char c; char c;
bool any_queued = false; bool any_queued = false;
@ -3915,8 +3915,8 @@ static int pl_save_update_control(struct playlist_info* playlist,
playlist->control_fd = open(tmpbuf, O_CREAT|O_RDWR|O_TRUNC, 0666); playlist->control_fd = open(tmpbuf, O_CREAT|O_RDWR|O_TRUNC, 0666);
if (playlist->control_fd < 0) if (playlist->control_fd < 0)
{ {
close(old_fd); err = -3;
return -3; goto error;
} }
/* Write out playlist filename */ /* Write out playlist filename */
@ -3932,8 +3932,8 @@ static int pl_save_update_control(struct playlist_info* playlist,
if (err <= 0) if (err <= 0)
{ {
close(old_fd); err = -4;
return -4; goto error;
} }
if (playlist->first_index > 0) if (playlist->first_index > 0)
@ -3964,8 +3964,10 @@ static int pl_save_update_control(struct playlist_info* playlist,
index, playlist->last_insert_pos, index, playlist->last_insert_pos,
tmpbuf, NULL, &seekpos); tmpbuf, NULL, &seekpos);
if (err <= 0) if (err <= 0)
return -5; {
err = -5;
goto error;
}
/* Update seek offset for the new control file. */ /* Update seek offset for the new control file. */
playlist->indices[index] &= ~PLAYLIST_SEEK_MASK; playlist->indices[index] &= ~PLAYLIST_SEEK_MASK;
playlist->indices[index] |= seekpos; playlist->indices[index] |= seekpos;
@ -3980,7 +3982,10 @@ static int pl_save_update_control(struct playlist_info* playlist,
err = update_control_unlocked(playlist, PLAYLIST_COMMAND_FLAGS, err = update_control_unlocked(playlist, PLAYLIST_COMMAND_FLAGS,
PLAYLIST_FLAG_MODIFIED, 0, NULL, NULL, NULL); PLAYLIST_FLAG_MODIFIED, 0, NULL, NULL, NULL);
if (err <= 0) if (err <= 0)
return -6; {
err = -6;
goto error;
}
} }
else else
{ {
@ -4006,7 +4011,12 @@ static int pl_save_update_control(struct playlist_info* playlist,
playlist->control_fd = open(playlist->control_filename, O_RDWR); playlist->control_fd = open(playlist->control_filename, O_RDWR);
playlist->control_created = (playlist->control_fd >= 0); playlist->control_created = (playlist->control_fd >= 0);
return 0; return 0;
error:
close(old_fd);
return err;
} }
int playlist_save(struct playlist_info* playlist, char *filename) int playlist_save(struct playlist_info* playlist, char *filename)