[zaptel-commits] mmichelson: branch 1.4 r3206 - in /branches/1.4: ./ sethdlc-new.c sethdlc.c

[SVN commits to the Zaptel project]

Author: mmichelson
Date: Wed Oct 31 16:09:21 2007
New Revision: 3206

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3206
Log:
Merged revisions 3205 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3205 | mmichelson | 2007-10-31 16:08:15 -0500 (Wed, 31 Oct 2007) | 5 lines

Fixed potential buffer overflow.

See AST-2007-024 for more details


........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/sethdlc-new.c
    branches/1.4/sethdlc.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/sethdlc-new.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/sethdlc-new.c?view=diff&rev=3206&r1=3205&r2=3206
==============================================================================
--- branches/1.4/sethdlc-new.c (original)
+++ branches/1.4/sethdlc-new.c Wed Oct 31 16:09:21 2007
@@ -673,7 +673,7 @@
 	if (sock < 0)
 		error("Unable to create socket: %s\n", strerror(errno));
   
-	strcpy(req.ifr_name, argv[1]); /* Device name */
+	strncpy(req.ifr_name, argv[1], sizeof(req.ifr_name) - 1); /* Device name */
 
 	if (argc == 2)
 		show_port();

Modified: branches/1.4/sethdlc.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/sethdlc.c?view=diff&rev=3206&r1=3205&r2=3206
==============================================================================
--- branches/1.4/sethdlc.c (original)
+++ branches/1.4/sethdlc.c Wed Oct 31 16:09:21 2007
@@ -293,7 +293,7 @@
 	if (sock<0)
 		error("Unable to create socket: %s\n", strerror(errno));
   
-	strcpy(req.ifr_name, argv[1]); /* Device name */
+	strncpy(req.ifr_name, argv[1], sizeof(req.ifr_name) - 1); /* Device name */
 
 	if (argc == 2) {
 		show_port(sock);