[Pkg-voip-commits] r8835 - /asterisk/branches/squeeze/debian/patches/AST-2011-003

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Thu Mar 17 18:01:05 2011
New Revision: 8835

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8835
Log:
Fix a double write in original upstream fix

Fixes: "Double welcome message (Asterisk Call Manager/1.1)"
https://issues.asterisk.org/view.php?id=18987

Modified:
    asterisk/branches/squeeze/debian/patches/AST-2011-003

Modified: asterisk/branches/squeeze/debian/patches/AST-2011-003
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/squeeze/debian/patches/AST-2011-003?rev=8835&op=diff
==============================================================================
--- asterisk/branches/squeeze/debian/patches/AST-2011-003 (original)
+++ asterisk/branches/squeeze/debian/patches/AST-2011-003 Thu Mar 17 18:01:05 2011
@@ -29,11 +29,11 @@
 -		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);
++	FILE *f = s->f ? s->f : s->session->f;
++	int fd = s->f ? s->fd : s->session->fd;
 +	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))) {
++	if ((res = ast_careful_fwrite(f, fd, string, strlen(string), s->session->writetimeout))) {
 +		s->write_error = 1;
  	}
 +