Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed bug #633
   Description From  Michael Stone   2008-09-25 19:27:29   (-) [reply]

To determine whether a pid is occupied with the kill(pid, 0) idiom, you have to
test

#include <signal.h>
#include <errno.h>
kill(pid, 0) < 0 && errno == ESRCH

not just

#include <signal.h>
kill(pid, 0) < 0

otherwise you get incorrect results when pid is running as a different user
(causing kill(pid, 0) to return -1 + EPERM).

src/audio/alsa/SDL_alsa_audio.c is certainly affected by this bug in both
1.2.13 and 1.3-trunk. It probably occurs in other places as well.
  • Loading branch information
slouken committed Feb 17, 2009
1 parent 5a9fba4 commit 854f5a4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/audio/alsa/SDL_alsa_audio.c
Expand Up @@ -230,7 +230,7 @@ ALSA_WaitDevice(_THIS)
*/
/* Check every 10 loops */
if (this->hidden->parent && (((++cnt) % 10) == 0)) {
if (kill(this->hidden->parent, 0) < 0) {
if (kill(this->hidden->parent, 0) < 0 && errno == ESRCH) {
this->enabled = 0;
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/audio/arts/SDL_artsaudio.c
Expand Up @@ -27,6 +27,7 @@
#include <signal.h>
#endif
#include <unistd.h>
#include <errno.h>

#include "SDL_timer.h"
#include "SDL_audio.h"
Expand Down Expand Up @@ -149,7 +150,7 @@ ARTS_WaitDevice(_THIS)
*/
/* Check every 10 loops */
if (this->hidden->parent && (((++cnt) % 10) == 0)) {
if (kill(this->hidden->parent, 0) < 0) {
if (kill(this->hidden->parent, 0) < 0 && errno == ESRCH) {
this->enabled = 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/audio/dma/SDL_dmaaudio.c
Expand Up @@ -417,7 +417,7 @@ DMA_WaitDevice(_THIS)
that use a different process id for each thread.
*/
if (parent && (((++cnt) % 10) == 0)) { /* Check every 10 loops */
if (kill(parent, 0) < 0) {
if (kill(parent, 0) < 0 && errno == ESRCH) {
this->enabled = 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/audio/esd/SDL_esdaudio.c
Expand Up @@ -128,7 +128,7 @@ ESD_WaitDevice(_THIS)
*/
/* Check every 10 loops */
if (this->hidden->parent && (((++cnt) % 10) == 0)) {
if (kill(this->hidden->parent, 0) < 0) {
if (kill(this->hidden->parent, 0) < 0 && errno == ESRCH) {
this->enabled = 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/audio/pulseaudio/SDL_pulseaudio.c
Expand Up @@ -165,7 +165,7 @@ PULSEAUDIO_WaitDevice(_THIS)
*/
/* Check every 10 loops */
if (this->hidden->parent && (((++cnt) % 10) == 0)) {
if (kill(this->hidden->parent, 0) < 0) {
if (kill(this->hidden->parent, 0) < 0 && errno == ESRCH) {
this->enabled = 0;
}
}
Expand Down

0 comments on commit 854f5a4

Please sign in to comment.