d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some parameter was left uninitialized when the card with incomplete

Browse Source 
"Version 1" CIS tupple is plugged after normal card.
This commit is contained in:
hosokawa 1998-03-20 04:49:19 +00:00
parent dd095881a0
commit f4dbb36a3e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/pccard/pccardd/readcis.c
View File

@ -26,7 +26,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: readcis.c,v 1.10 1997/10/06 11:36:08 charnier Exp $";
"$Id: readcis.c,v 1.11 1997/11/18 21:08:14 nate Exp $";
#endif /* not lint */
#include <err.h>
@ -170,14 +170,19 @@ freecis(struct cis *cp)
static void
cis_info(struct cis *cp, unsigned char *p, int len)
{
*cp->manuf = *cp->vers = *cp->add_info1 = *cp->add_info2 = '\0';
cp->maj_v = *p++;
cp->min_v = *p++;
if (*p == 0xff) return;
strncpy(cp->manuf, p, CIS_MAXSTR - 1);
while (*p++);
if (*p == 0xff) return;
strncpy(cp->vers, p, CIS_MAXSTR - 1);
while (*p++);
if (*p == 0xff) return;
strncpy(cp->add_info1, p, CIS_MAXSTR - 1);
while (*p++);
if (*p == 0xff) return;
strncpy(cp->add_info2, p, CIS_MAXSTR - 1);
}