33 lines
793 B
Plaintext
33 lines
793 B
Plaintext
|
$OpenBSD: patch-src_iodbc_misc_c,v 1.1.1.1 2004/07/16 21:01:35 todd Exp $
|
||
|
|
--- src/iodbc/misc.c.orig Wed Jun 2 01:31:41 1999
|
||
|
|
+++ src/iodbc/misc.c Wed Apr 30 10:04:59 2003
|
||
|
|
@@ -236,8 +236,8 @@ _iodbcdm_getkeyvalbydsn (
|
||
|
|
|
||
|
|
value[0] = '\0';
|
||
|
|
|
||
|
|
- STRNCAT (dsntk, dsn, dsnlen);
|
||
|
|
- STRCAT (dsntk, "]");
|
||
|
|
+ strlcat (dsntk, dsn, sizeof(dsntk));
|
||
|
|
+ strlcat (dsntk, "]", sizeof(dsntk));
|
||
|
|
|
||
|
|
dsnlen = dsnlen + 2;
|
||
|
|
|
||
|
|
@@ -320,7 +320,7 @@ _iodbcdm_getkeyvalbydsn (
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
|
||
|
|
- STRNCPY (value, token, size);
|
||
|
|
+ strlcpy (value, token, size);
|
||
|
|
/* copy the value(i.e. next token) to buf */
|
||
|
|
|
||
|
|
if (dsnid != DSN_DEFAULT)
|
||
|
|
@@ -400,7 +400,7 @@ _iodbcdm_getkeyvalinstr (
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
|
||
|
|
- STRNCPY (value, token, size);
|
||
|
|
+ strlcpy (value, token, size);
|
||
|
|
|
||
|
|
return value;
|
||
|
|
|