[svn-commits] file: branch 1.6.0 r109398 - in /branches/1.6.0: ./ main/logger.c main/manager.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Mar 18 10:16:14 2008
New Revision: 109398

URL: http://svn.digium.com/view/asterisk?view=rev&rev=109398
Log:
Merged revisions 109396 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r109396 | file | 2008-03-18 12:13:07 -0300 (Tue, 18 Mar 2008) | 3 lines

Make sure values are interpreted as character strings and not format strings.
(AST-2008-004)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/logger.c
    branches/1.6.0/main/manager.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/logger.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/logger.c?view=diff&rev=109398&r1=109397&r2=109398
==============================================================================
--- branches/1.6.0/main/logger.c (original)
+++ branches/1.6.0/main/logger.c Tue Mar 18 10:16:14 2008
@@ -1145,7 +1145,7 @@
 
 	strcpy(logmsg->str, buf->str);
 
-	ast_log(LOG_VERBOSE, logmsg->str);
+	ast_log(LOG_VERBOSE, "%s", logmsg->str);
 
 	/* Set type */
 	logmsg->type = LOGMSG_VERBOSE;

Modified: branches/1.6.0/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=109398&r1=109397&r2=109398
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Tue Mar 18 10:16:14 2008
@@ -1982,7 +1982,7 @@
 			term_strip(final_buf, buf, l);
 			final_buf[l] = '\0';
 		}
-		astman_append(s, S_OR(final_buf, buf));
+		astman_append(s, "%s", S_OR(final_buf, buf));
 		ast_free(buf);
 	}
 	close(fd);