Changeset 11050 for branches

Timestamp:

Jul 24, 2010, 5:09:41 PM (12 years ago)

Author:

charles

Message:

(2.0x libT) #3449 "overflow error in tr_truncd()" -- fixed

Location:

branches/2.0x/libtransmission

Files:

• utils-test.c (modified) (2 diffs)
• utils.c (modified) (1 diff)

branches/2.0x/libtransmission/utils-test.c

@@ -354 +354 @@
 }
 
+static int
+test_truncd( void )
+{
+    char buf[32];
+
+    tr_snprintf( buf, sizeof( buf ), "%.2f%%", 99.999 );
+    check( !strcmp( buf, "100.00%" ) );
+
+    tr_snprintf( buf, sizeof( buf ), "%.2f%%", tr_truncd( 99.999, 2 ) );
+    check( !strcmp( buf, "99.99%" ) );
+
+    tr_snprintf( buf, sizeof( buf ), "%.4f", tr_truncd( 403650.656250, 4 ) );
+    check( !strcmp( buf, "403650.6562" ) );
+
+    return 0;
+}
+
 int
 main( void )
 {
-    char buf[32];
     char *in, *out;
     int   len;
     int   i;
     int   l;
-
-    /* tr_truncd */
-    tr_snprintf( buf, sizeof( buf ), "%.2f%%", 99.999 );
-    check( !strcmp( buf, "100.00%" ) );
-    tr_snprintf( buf, sizeof( buf ), "%.2f%%", tr_truncd( 99.999, 2 ) );
-    check( !strcmp( buf, "99.99%" ) );
 
     /* base64 */
@@ -402 +412 @@
     if( ( i = test_url( ) ) )
         return i;
+    if( ( i = test_truncd( ) ) )
+        return i;
 
     /* test that tr_cryptoRandInt() stays in-bounds */

branches/2.0x/libtransmission/utils.c

@@ -1405 +1405 @@
 {
     const int i = (int) pow( 10, decimal_places );  
-    double x2 = (int)(x*i);
+    const double x2 = (int64_t)(x * i);
     return x2 / i;
 }