Changeset 1562

Timestamp:

Mar 12, 2007, 12:04:11 AM (16 years ago)

Author:

joshe

Message:

Don't use sprintf, strcpy, or strcat.

Location:

trunk

Files:

• cli/transmissioncli.c (modified) (1 diff)
• gtk/util.c (modified) (2 diffs)
• libtransmission/metainfo.c (modified) (3 diffs)
• libtransmission/peer.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/transmission.c (modified) (1 diff)

trunk/cli/transmissioncli.c

@@ -113 +113 @@
     {
         static char env[11];
-        sprintf( env, "TR_DEBUG=%d", verboseLevel );
+        snprintf( env, sizeof env, "TR_DEBUG=%d", verboseLevel );
         putenv( env );
     }

trunk/gtk/util.c

@@ -282 +282 @@
 
 const char *
-addactionname(guint flag) {
-  static char name[6];
-
-  if(TR_TORNEW_SAVE_COPY & flag)
-    strcpy(name, "copy");
-  else if(TR_TORNEW_SAVE_MOVE & flag)
-    strcpy(name, "move");
-  else
-    strcpy(name, "leave");
-
-  return name;
+addactionname( guint flag )
+{
+    static char name[6];
+
+    snprintf( name, sizeof name, "%s",
+              ( TR_TORNEW_SAVE_COPY & flag ? "copy" :
+              ( TR_TORNEW_SAVE_MOVE & flag ? "move" :
+                                             "leave" ) ) );
+
+    return name;
 }
 
@@ -324 +323 @@
             if( NULL == getcwd( wd, MAX_PATH_LENGTH + 1 ) )
             {
-                strcpy( wd, "." );
+                snprintf( wd, MAX_PATH_LENGTH + 1, "." );
             }
         }

trunk/libtransmission/metainfo.c

@@ -116 +116 @@
     for( i = 0; i < SHA_DIGEST_LENGTH; i++ )
     {
-        sprintf( inf->hashString + i * 2, "%02x", inf->hash[i] );
+        snprintf( inf->hashString + i * 2, sizeof( inf->hashString ) - i * 2,
+                  "%02x", inf->hash[i] );
     }
 
@@ -495 +496 @@
     int  newlen = 6;
     char * slash, * scrape;
-    
+    size_t scrapelen, used;
+
     slash = strrchr( announce, '/' );
     if( NULL == slash )
@@ -508 +510 @@
     }
 
-    scrape = calloc( strlen( announce ) - oldlen + newlen + 1, 1 );
-    strncat( scrape, announce, slash - announce );
-    strcat(  scrape, new );
-    strcat(  scrape, slash + oldlen );
+    scrapelen = strlen( announce ) - oldlen + newlen;
+    scrape = calloc( scrapelen + 1, 1 );
+    if( NULL == scrape )
+    {
+        return NULL;
+    }
+    assert( ( size_t )( slash - announce ) < scrapelen );
+    memcpy( scrape, announce, slash - announce );
+    used = slash - announce;
+    strncat( scrape, new, scrapelen - used );
+    used += newlen;
+    assert( strlen( scrape ) == used );
+    if( used < scrapelen )
+    {
+        assert( strlen( slash + oldlen ) == scrapelen - used );
+        strncat( scrape, slash + oldlen, scrapelen - used );
+    }
 
     return scrape;

trunk/libtransmission/peer.c

@@ -114 +114 @@
 
     va_start( args, msg );
-    sprintf( string, "%08x:%04x ",
+    snprintf( string, sizeof string, "%08x:%04x ",
              (uint32_t) peer->addr.s_addr, peer->port );
     vsnprintf( &string[14], sizeof( string ) - 14, msg, args );

trunk/libtransmission/torrent.c

@@ -128 +128 @@
     for( i = 0; i < SHA_DIGEST_LENGTH; i++ )
     {
-        sprintf( &tor->escapedHashString[3*i], "%%%02x", inf->hash[i] );
+        snprintf( &tor->escapedHashString[3*i],
+                  sizeof( tor->escapedHashString ) - 3 * i,
+                  "%%%02x", inf->hash[i] );
     }
 

trunk/libtransmission/transmission.c

@@ -44 +44 @@
        characters, where xx is the major version number and yy the
        minor version number (Azureus-style) */
-    sprintf( h->id, "-TR%02d%02d-", VERSION_MAJOR, VERSION_MINOR );
+    snprintf( h->id, sizeof h->id, "-TR%02d%02d-",
+              VERSION_MAJOR, VERSION_MINOR );
     for( i = 8; i < 20; i++ )
     {