Change overlapping `strcpy( x, y )' to `SAFEMEMCPY( x, y, strlen( y ) + 1 )'

diff --git a/libraries/libldap/tmplout.c b/libraries/libldap/tmplout.c
index 94cc00c1393068c4e0d53eaa4651f06986a28b8c..d815cfb954647725c8f1e72d9e9d0760b07b33ab 100644 (file)
--- a/libraries/libldap/tmplout.c
+++ b/libraries/libldap/tmplout.c
@@ -905,7 +905,7 @@ time2text( char *ldtimestr, int dateonly )
    
     timestr[ strlen( timestr ) - 1 ] = zone;   /* replace trailing newline */
     if ( dateonly ) {
-       strcpy( timestr + 11, timestr + 20 );
+       SAFEMEMCPY( timestr + 11, timestr + 20, strlen( timestr + 20 ) + 1 );
     }
 
     return( timestr );

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index e5fa3bca6f08380b764f35951e2695c917ae9b94..d56881a8364095db1efda861ae8f45eb41508b67 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -484,11 +484,11 @@ strtok_quote( char *line, char *sep )
                        } else {
                                inquote = 1;
                        }
-                       strcpy( next, next + 1 );
+                       SAFEMEMCPY( next, next + 1, strlen( next + 1 ) + 1 );
                        break;
 
                case '\\':
-                       strcpy( next, next + 1 );
+                       SAFEMEMCPY( next, next + 1, strlen( next + 1 ) + 1 );
                        break;
 
                default:

diff --git a/servers/slapd/tools/ldapsyntax.c b/servers/slapd/tools/ldapsyntax.c
index 421f4fcd0018cb28afa5594c6a8d06eeb1118796..2495e4db22d6dab7eda7c13e1f9e794b4a07b2ea 100644 (file)
--- a/servers/slapd/tools/ldapsyntax.c
+++ b/servers/slapd/tools/ldapsyntax.c
@@ -315,7 +315,7 @@ de_crypt( char *s )
     char *p;
 
     if ( strncmp( s, "{CRYPT}", 7 ) == 0 ) {
-       strcpy( s, s + 7 );                     /* strip off "{CRYPT}" */
+       SAFEMEMCPY( s, s + 7, strlen( s + 7 ) + 1 ); /* strip off "{CRYPT}" */
 
        for ( p = s; *p != '\0'; ++p) {         /* "decrypt" each byte */
            if ( *p != CRYPT_MASK ) {

diff --git a/servers/slurpd/config.c b/servers/slurpd/config.c
index 43a4bcd90b8796ac465a22086461a29d18a5bd0b..47d8fb419add4b00f68b308c65df6cf7e9e24d5f 100644 (file)
--- a/servers/slurpd/config.c
+++ b/servers/slurpd/config.c
@@ -173,11 +173,11 @@ strtok_quote(
            } else {
                inquote = 1;
            }
-           strcpy( next, next + 1 );
+           SAFEMEMCPY( next, next + 1, strlen( next + 1 ) + 1 );
            break;
 
        case '\\':
-           strcpy( next, next + 1 );
+           SAFEMEMCPY( next, next + 1, strlen( next + 1 ) + 1 );
            break;
 
        default: