[svn-commits] file: branch 1.4 r3259 - in /branches/1.4: ./ ztdynamic.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Nov 28 16:53:54 2007
New Revision: 3259

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

........
r3258 | file | 2007-11-28 18:52:54 -0400 (Wed, 28 Nov 2007) | 6 lines

Pass the correct variable to sizeof when copying the driver name.
(closes issue #11352)
Reported by: brettcar
Patches:
      ztdynamic.c.patch uploaded by eliel (license 64)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/ztdynamic.c

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

Modified: branches/1.4/ztdynamic.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/ztdynamic.c?view=diff&rev=3259&r1=3258&r2=3259
==============================================================================
--- branches/1.4/ztdynamic.c (original)
+++ branches/1.4/ztdynamic.c Wed Nov 28 16:53:54 2007
@@ -611,7 +611,7 @@
 	memset(z->msgbuf, 0, bufsize);
 
 	/* Setup parameters properly assuming we're going to be okay. */
-	strncpy(z->dname, zds->driver, sizeof(z->driver) - 1);
+	strncpy(z->dname, zds->driver, sizeof(z->dname) - 1);
 	strncpy(z->addr, zds->addr, sizeof(z->addr) - 1);
 	z->timing = zds->timing;
 	sprintf(z->span.name, "ZTD/%s/%s", zds->driver, zds->addr);