Fix data_disconnect to shutdown only if datasocket

wvu · wvu · commit b701048ce250 · 2016-09-05T15:54:26.000-05:00
Seeing people use this with ensure when their data channel was never set
up. This breaks things. :)
diff --git a/lib/msf/core/exploit/ftp.rb b/lib/msf/core/exploit/ftp.rb
@@ -96,7 +96,7 @@ def data_connect(mode = nil, nsock = self.sock)
   # This method handles disconnecting our data channel
   #
   def data_disconnect
-    self.datasocket.shutdown
+    self.datasocket.shutdown if self.datasocket
     self.datasocket = nil
   end
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ def data_connect(mode = nil, nsock = self.sock)`
`96`	`96`	`# This method handles disconnecting our data channel`
`97`	`97`	`#`
`98`	`98`	`def data_disconnect`
`99`		`- self.datasocket.shutdown`
	`99`	`+ self.datasocket.shutdown if self.datasocket`
`100`	`100`	`self.datasocket = nil`
`101`	`101`	`end`
`102`	`102`