[asterisk-commits] twilson: tag 1.6.1.23 r310983 - in /tags/1.6.1.23/main: manager.c tcptls.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Mar 16 13:39:04 2011
New Revision: 310983

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=310983
Log:
AST-2011-3 and AST-2011-4

Modified:
    tags/1.6.1.23/main/manager.c
    tags/1.6.1.23/main/tcptls.c

Modified: tags/1.6.1.23/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.1.23/main/manager.c?view=diff&rev=310983&r1=310982&r2=310983
==============================================================================
--- tags/1.6.1.23/main/manager.c (original)
+++ tags/1.6.1.23/main/manager.c Wed Mar 16 13:39:04 2011
@@ -220,6 +220,7 @@
 	struct mansession_session *session;
 	FILE *f;
 	int fd;
+	int write_error:1;
 };
 
 #define NEW_EVENT(m)	(AST_LIST_NEXT(m->session->last_ev, eq_next))
@@ -944,11 +945,15 @@
  */
 static int send_string(struct mansession *s, char *string)
 {
-	if (s->f) {
-		return ast_careful_fwrite(s->f, s->fd, string, strlen(string), s->session->writetimeout);
-	} else {
-		return ast_careful_fwrite(s->session->f, s->session->fd, string, strlen(string), s->session->writetimeout);
-	}
+	int res;
+
+	if (s->f && (res = ast_careful_fwrite(s->f, s->fd, string, strlen(string), s->session->writetimeout))) {
+		s->write_error = 1;
+	} else if ((res = ast_careful_fwrite(s->session->f, s->session->fd, string, strlen(string), s->session->writetimeout))) {
+		s->write_error = 1;
+	}
+
+	return res;
 }
 
 /*!
@@ -3204,7 +3209,7 @@
 
 	astman_append(&s, "Asterisk Call Manager/%s\r\n", AMI_VERSION);	/* welcome prompt */
 	for (;;) {
-		if ((res = do_message(&s)) < 0)
+		if ((res = do_message(&s)) < 0 || s.write_error)
 			break;
 	}
 	/* session is over, explain why and terminate */

Modified: tags/1.6.1.23/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.1.23/main/tcptls.c?view=diff&rev=310983&r1=310982&r2=310983
==============================================================================
--- tags/1.6.1.23/main/tcptls.c (original)
+++ tags/1.6.1.23/main/tcptls.c Wed Mar 16 13:39:04 2011
@@ -139,8 +139,12 @@
 	* open a FILE * as appropriate.
 	*/
 	if (!tcptls_session->parent->tls_cfg) {
-		tcptls_session->f = fdopen(tcptls_session->fd, "w+");
-		setvbuf(tcptls_session->f, NULL, _IONBF, 0);
+		if ((tcptls_session->f = fdopen(tcptls_session->fd, "w+"))) {
+			if(setvbuf(tcptls_session->f, NULL, _IONBF, 0)) {
+				fclose(tcptls_session->f);
+				tcptls_session->f = NULL;
+			}
+		}
 	}
 #ifdef DO_SSL
 	else if ( (tcptls_session->ssl = SSL_new(tcptls_session->parent->tls_cfg->ssl_ctx)) ) {