Changeset 14525

Timestamp:

May 9, 2015, 8:37:55 AM (6 years ago)

Author:

mikedld

Message:

Fix some issues revealed by coverity

Location:

trunk

Files:

• gtk/conf.c (modified) (1 diff)
• gtk/tr-prefs.c (modified) (1 diff)
• gtk/util.c (modified) (1 diff)
• libtransmission/announcer.c (modified) (1 diff)
• libtransmission/peer-mgr.c (modified) (2 diffs)
• libtransmission/peer-msgs.c (modified) (1 diff)
• libtransmission/rpc-server.c (modified) (2 diffs)
• libtransmission/torrent-magnet.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/trevent.c (modified) (1 diff)
• libtransmission/upnp.c (modified) (1 diff)
• qt/details.cc (modified) (1 diff)
• qt/freespace-label.cc (modified) (1 diff)
• qt/torrent-filter.cc (modified) (1 diff)

trunk/gtk/conf.c

@@ -173 +173 @@
   bool boolVal;
 
-  tr_variantDictFindBool (getPrefs (), key, &boolVal);
+  if (!tr_variantDictFindBool (getPrefs (), key, &boolVal))
+    boolVal = false;
 
   return boolVal != 0;

trunk/gtk/tr-prefs.c

@@ -971 +971 @@
       char buf[128];
       GtkTreeIter iter;
-      struct tm   tm;
-      tm.tm_hour = i / 60;
-      tm.tm_min = i % 60;
-      tm.tm_sec = 0;
-      strftime (buf, sizeof (buf), "%H:%M", &tm);
+      g_snprintf (buf, sizeof (buf), "%02d:%02d", i / 60, i % 60);
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter, 0, i, 1, buf, -1);

trunk/gtk/util.c

@@ -432 +432 @@
   GtkCellRenderer * r;
   GtkListStore * store;
-  va_list vl;
   const char * text;
-  va_start (vl, text_1);
 
   store = gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING);
 
   text = text_1;
-  if (text != NULL) do
-    {
-      const int val = va_arg (vl, int);
-      gtk_list_store_insert_with_values (store, NULL, INT_MAX, 0, val, 1, text, -1);
-      text = va_arg (vl, const char *);
-    }
-  while (text != NULL);
+  if (text != NULL)
+    {
+      va_list vl;
+
+      va_start (vl, text_1);
+      do
+        {
+          const int val = va_arg (vl, int);
+          gtk_list_store_insert_with_values (store, NULL, INT_MAX, 0, val, 1, text, -1);
+          text = va_arg (vl, const char *);
+        }
+      while (text != NULL);
+      va_end (vl);
+    }
 
   w = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));

trunk/libtransmission/announcer.c

@@ -1146 +1146 @@
             /* if the tracker included scrape fields in its announce response,
                then a separate scrape isn't needed */
-            if ((scrape_fields >= 3) || (!tracker->scrape && (scrape_fields >= 1)))
+            if (scrape_fields >= 3 || (scrape_fields >= 1 && tracker->scrape != NULL))
             {
                 tr_logAddTorDbg (tier->tor, "Announce response contained scrape info; "

trunk/libtransmission/peer-mgr.c

@@ -878 +878 @@
   /* we consider ourselves to be in endgame if the number of bytes
      we've got requested is >= the number of bytes left to download */
-  return (s->requestCount * s->tor->blockSize)
+  return ((uint64_t) s->requestCount * s->tor->blockSize)
                >= tr_torrentGetLeftUntilDone (s->tor);
 }
@@ -1995 +1995 @@
       ensureAtomExists (s, addr, port, 0, -1, TR_PEER_FROM_INCOMING);
       atom = getExistingAtom (s, addr);
+
+      assert (atom != NULL);
+
       atom->time = tr_time ();
       atom->piece_data_time = 0;

trunk/libtransmission/peer-msgs.c

@@ -1952 +1952 @@
 
         data = tr_torrentGetMetadataPiece (msgs->torrent, piece, &dataLen);
-        if ((dataLen > 0) && (data != NULL))
+        if (data != NULL)
         {
             tr_variant tmp;

trunk/libtransmission/rpc-server.c

@@ -501 +501 @@
                                               webClientDir,
                                               TR_PATH_DELIMITER_STR,
-                                              subpath && *subpath ? subpath : "index.html");
+                                              *subpath != '\0' ? subpath : "index.html");
           serve_file (req, server, filename);
           tr_free (filename);
@@ -614 +614 @@
           size_t plen;
           char * p = tr_base64_decode_str (auth + 6, &plen);
-          if (p && plen && ((pass = strchr (p, ':'))))
+          if (p != NULL)
             {
-              user = p;
-              *pass++ = '\0';
+              if (plen > 0 && (pass = strchr (p, ':')) != NULL)
+                {
+                  user = p;
+                  *pass++ = '\0';
+                }
+              else
+                {
+                  tr_free (p);
+                }
             }
         }

trunk/libtransmission/torrent-magnet.c

@@ -193 +193 @@
     }
 
+    assert (ret == NULL || *len > 0);
+
     return ret;
 }

trunk/libtransmission/torrent.c

@@ -2094 +2094 @@
 torrentCallScript (const tr_torrent * tor, const char * script)
 {
-  char timeStr[128];
+  char timeStr[128], * newlinePos;
   const time_t now = tr_time ();
 
   tr_strlcpy (timeStr, ctime (&now), sizeof (timeStr));
-  *strchr (timeStr,'\n') = '\0';
+
+  /* ctime () includes '\n', but it's better to be safe */
+  newlinePos = strchr (timeStr, '\n');
+  if (newlinePos != NULL)
+    *newlinePos = '\0';
 
   if (script && *script)

trunk/libtransmission/trevent.c

@@ -285 +285 @@
     assert (tr_isSession (session));
 
+    if (session->events == NULL)
+        return;
+
     session->events->die = true;
     tr_logAddDeep (__FILE__, __LINE__, NULL, "closing trevent pipe");

trunk/libtransmission/upnp.c

@@ -283 +283 @@
         errno = 0;
 
-        if (!handle->urls.controlURL || !handle->data.first.servicetype)
+        if (!handle->urls.controlURL)
             handle->isMapped = 0;
         else

trunk/qt/details.cc

@@ -113 +113 @@
       QTreeWidget * tw (treeWidget ());
       const int column = tw ? tw->sortColumn () : 0;
+
+      assert (i != nullptr);
+
       switch (column)
         {

trunk/qt/freespace-label.cc

@@ -90 +90 @@
   // update the label
   int64_t bytes = -1;
-  tr_variantDictFindInt (arguments, TR_KEY_size_bytes, &bytes);
-  if (bytes >= 0)
+  if (tr_variantDictFindInt (arguments, TR_KEY_size_bytes, &bytes) && bytes >= 0)
     setText (tr("%1 free").arg(Formatter::sizeToString (bytes)));
   else

trunk/qt/torrent-filter.cc

@@ -133 +133 @@
         if (!val)
           val = -compare (a->queuePosition(), b->queuePosition());
+        // fall through
 
       case SortMode::SORT_BY_RATIO: