mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00
Code Issues Releases Activity

Fix a potential infinite loop when starting esd from gnome-settings-daemon.

Browse Source
This commit is contained in:
Joe Marcus Clarke 2008-07-18 04:35:19 +00:00
parent 9bbed3bcbf
commit 54b9cc63c7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=217006
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/esound/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= esound
PORTVERSION= 0.2.39
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2

15
audio/esound/files/patch-ad
View File

@ -1,5 +1,5 @@
--- esdlib.c.orig 2008-07-15 11:35:15.000000000 -0400
+++ esdlib.c 2008-07-17 13:46:44.000000000 -0400
+++ esdlib.c 2008-07-18 00:33:42.000000000 -0400
@@ -21,6 +21,8 @@
#include <errno.h>
#include <sys/wait.h>
@ -9,7 +9,16 @@
#include <sys/un.h>
@@ -889,8 +891,7 @@ int esd_open_sound( const char *host )
@@ -152,6 +154,8 @@ write_timeout (int fd, const char *buf,
if (n > 0)
nwritten += n;
+ else if (n < 0)
+ break;
} while (nwritten < buflen);
fcntl (fd, F_SETFL, flags);
@@ -889,8 +893,7 @@ int esd_open_sound( const char *host )
setsid();
cmd = malloc(strlen(SERVERDIR"/esd -spawnfd 999999") + (esd_spawn_options?strlen(esd_spawn_options):0));
@ -19,7 +28,7 @@
execl("/bin/sh", "/bin/sh", "-c", cmd, NULL);
perror("execl");
_exit(1);
@@ -1703,3 +1704,34 @@ int esd_close( int esd )
@@ -1703,3 +1706,34 @@ int esd_close( int esd )
return close( esd );
}