Changeset 14282

Timestamp:

May 18, 2014, 8:47:58 PM (9 years ago)

Author:

jordan

Message:

fix tr_cryptoGetTorrentHash() behavior for crypto-test.c

Location:

trunk/libtransmission

Files:

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

trunk/libtransmission/crypto-test.c

@@ -30 +30 @@
 
   check (!tr_cryptoHasTorrentHash (&a));
-#ifdef NDEBUG
   check (tr_cryptoGetTorrentHash (&a) == NULL);
-#endif
 
   tr_cryptoSetTorrentHash (&a, hash);
@@ -52 +50 @@
   tr_cryptoSetTorrentHash (&a, NULL);
   check (!tr_cryptoHasTorrentHash (&a));
-#ifdef NDEBUG
   check (tr_cryptoGetTorrentHash (&a) == NULL);
-#endif
 
   tr_cryptoDestruct (&a);

trunk/libtransmission/crypto.c

@@ -283 +283 @@
 {
   assert (crypto);
-  assert (crypto->torrentHashIsSet);
-
-  return crypto->torrentHash;
+
+  return crypto->torrentHashIsSet ? crypto->torrentHash : NULL;
 }