Bug 1336855 - Use ScopedPRFileDesc for ssl_fd, r=franziskus

--HG-- extra : histedit_source : c35a9233819f0b362a118a4f21a9d23a16c975c5
sailfishos-mirror · Feb 6, 2017 · 602249e · 602249e
1 parent 461a681
commit 602249e
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 72 deletions.
diff --git a/gtests/ssl_gtest/test_io.cc b/gtests/ssl_gtest/test_io.cc
@@ -291,12 +291,12 @@ static const struct PRIOMethods DummyMethods = {
     DummyReserved,      DummyReserved,
     DummyReserved,      DummyReserved};
 
-PRFileDesc *DummyPrSocket::CreateFD() {
+ScopedPRFileDesc DummyPrSocket::CreateFD() {
   if (test_fd_identity == PR_INVALID_IO_LAYER) {
     test_fd_identity = PR_GetUniqueIdentity("testtransportadapter");
   }
 
-  PRFileDesc *fd = PR_CreateIOLayerStub(test_fd_identity, &DummyMethods);
+  ScopedPRFileDesc fd(PR_CreateIOLayerStub(test_fd_identity, &DummyMethods));
   fd->secret = reinterpret_cast<PRFilePrivate *>(this);
   return fd;
 }

diff --git a/gtests/ssl_gtest/test_io.h b/gtests/ssl_gtest/test_io.h
@@ -15,6 +15,7 @@
 #include <string>
 
 #include "prio.h"
+#include "scoped_ptrs.h"
 
 namespace nss_test {
 
@@ -59,7 +60,9 @@ class DummyPrSocket {
         writeable_(true) {}
   ~DummyPrSocket();
 
-  PRFileDesc* CreateFD();
+  // Create a file descriptor that will reference this object.  The fd must not
+  // live longer than this adapter; call PR_Close() before.
+  ScopedPRFileDesc CreateFD();
 
   std::weak_ptr<DummyPrSocket>& peer() { return peer_; }
   void SetPeer(const std::shared_ptr<DummyPrSocket>& peer) { peer_ = peer; }