X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=fbe740a892b9108a6fa4ac5b78421c79f6bc3631;hp=03621e0076a9abc72e14a75c03c6cb2c1c82a00c;hb=4df56926d10669ec120510957d3aa3fddb16e3c6;hpb=af74979ce3df0df99c8f460d2430e8eb1e6a7ff1

diff --git a/vss.c b/vss.c
index 03621e00..fbe740a8 100644
--- a/vss.c
+++ b/vss.c
@@ -198,7 +198,8 @@ static void vss_eof(void)
 	mmd->afd.afhi.chunk_table = NULL;
 	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1],
 		status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
-	strcpy(mmd->afd.afhi.info_string, tmp);
+	strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string));
+	mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0';
 	free(tmp);
 	mmd->afd.path[0] = '\0';
 	mmd->afd.afsi.lyrics_id = 0;
@@ -266,6 +267,10 @@ static enum afs_socket_status afsss;
  * This function gets called from para_server to determine the timeout value
  * for its main select loop.
  *
+ * \param rfds The set of file descriptors to be checked for reading.
+ * \param wfds The set of file descriptors to be checked for writing.
+ * \param max_fileno The highest-numbered file descriptor.
+ *
  * Before the timeout is computed, the current vss status flags are evaluated
  * and acted upon by calling appropriate functions from the lower layers.
  * Possible actions include
@@ -316,7 +321,8 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
 		return tv;
 	if (!map && vss_playing() &&
 			!(mmd->new_vss_status_flags & VSS_NOMORE)) {
-		if (afsss == AFS_SOCKET_READY) {
+		if (afsss == AFS_SOCKET_READY ||
+				afsss == AFS_SOCKET_CHECK_FOR_WRITE) {
 			PARA_DEBUG_LOG("ready and playing, but no audio file\n");
 			para_fd_set(afs_socket, wfds, max_fileno);
 			afsss = AFS_SOCKET_CHECK_FOR_WRITE;
@@ -347,7 +353,6 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
 		return -E_SHORT_AFS_READ;
 	*code = *(uint32_t*)buf;
 	*data =  *(uint32_t*)(buf + 4);
-	cmsg = CMSG_FIRSTHDR(&msg);
 	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
 		if (cmsg->cmsg_level != SOL_SOCKET
 			|| cmsg->cmsg_type != SCM_RIGHTS)
@@ -393,7 +398,6 @@ static void recv_afs_result(void)
 	map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
 		passed_fd, 0);
 	close(passed_fd);
-	mmd->afd.afhi.header_len = 0; /* default: no header */
 	mmd->chunks_sent = 0;
 	mmd->current_chunk = 0;
 	mmd->offset = 0;