Combine PRs ruby-ldap#306 & ruby-ldap#308

rlue · Jun 26, 2018 · e662a8c · e662a8c
1 parent d78dc1e
commit e662a8c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/net/ldap/connection.rb b/lib/net/ldap/connection.rb
@@ -74,7 +74,8 @@ def open_connection(server)
 
   module GetbyteForSSLSocket
     def getbyte
-      getc.ord
+      (nextbyte = read(1)) or return
+      nextbyte.ord
     end
   end
 
@@ -467,6 +468,10 @@ def search(args = nil)
           end
         end
 
+        if result_pdu.nil?
+          raise Net::LDAP::ResponseMissingOrInvalidError, "response missing"
+        end
+
         # count number of pages of results
         payload[:page_count] ||= 0
         payload[:page_count]  += 1