[svn-commits] russell: trunk r2100 - in /trunk: ./ ztcfg.c

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Feb  7 10:55:37 2007
New Revision: 2100

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2100
Log:
Merged revisions 2099 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r2099 | russell | 2007-02-07 10:51:27 -0600 (Wed, 07 Feb 2007) | 4 lines

In case the ZT_GETVERSION ioctl fails, ensure that the buffers are initialized
to "Unknown" so that we don't try to print uninitialized string buffers.
(issue #8992, Oron Peled, tzafrir)

........

Modified:
    trunk/   (props changed)
    trunk/ztcfg.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Feb  7 10:55:37 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039,2044,2087
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039,2044,2087,2099

Modified: trunk/ztcfg.c
URL: http://svn.digium.com/view/zaptel/trunk/ztcfg.c?view=diff&rev=2100&r1=2099&r2=2100
==============================================================================
--- trunk/ztcfg.c (original)
+++ trunk/ztcfg.c Wed Feb  7 10:55:37 2007
@@ -1130,6 +1130,9 @@
 	int ps;
 	int configs=0;
 	struct zt_versioninfo vi;
+
+	strcpy(vi.version, "Unknown");
+	strcpy(vi.echo_canceller, "Unknown");
 
 	if (ioctl(fd, ZT_GETVERSION, &vi))
 		error("Unable to read Zaptel version information.\n");