[asterisk-commits] russell: branch 1.6.0 r108474 - in /branches/1.6.0: ./ apps/app_followme.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Mar 13 15:27:24 2008
New Revision: 108474

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

................
r108472 | russell | 2008-03-13 15:26:59 -0500 (Thu, 13 Mar 2008) | 12 lines

Merged revisions 108469 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r108469 | russell | 2008-03-13 15:26:28 -0500 (Thu, 13 Mar 2008) | 4 lines

Fix a couple uses of sprintf.  The second one could actually cause an overflow
of a stack buffer.  It's not a security issue though, it only depends on your
configuration.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_followme.c

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

Modified: branches/1.6.0/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_followme.c?view=diff&rev=108474&r1=108473&r2=108474
==============================================================================
--- branches/1.6.0/apps/app_followme.c (original)
+++ branches/1.6.0/apps/app_followme.c Thu Mar 13 15:27:24 2008
@@ -782,9 +782,9 @@
 			}
 
 			if (!strcmp(tpargs->context, ""))
-				sprintf(dialarg, "%s", number);
+				snprintf(dialarg, sizeof(dialarg), "%s", number);
 			else
-				sprintf(dialarg, "%s@%s", number, tpargs->context);
+				snprintf(dialarg, sizeof(dialarg), "%s@%s", number, tpargs->context);
 					
 			tmpuser = ast_calloc(1, sizeof(*tmpuser));
 			if (!tmpuser) {