Land @jhart-r7's fix for decode_int

Author: jvazquez-r7

lib/rex/encoder/xdr.rb

@@ -16,8 +16,9 @@ def XDR.encode_int(int)
   end
 
   def XDR.decode_int!(data)
-      return data.slice!(0..3).unpack('N')[0] if data
-      data = 0
+    raise ArgumentError, 'XDR: No Integer data to decode' unless data
+    raise ArgumentError, "XDR: Too little data to decode (#{data.size})" if data.size < 4
+    return data.slice!(0..3).unpack('N')[0]
   end
 
   def XDR.encode_lchar(char)

spec/lib/rex/encoder/xdr_spec.rb

@@ -23,16 +23,16 @@
 
     context "when data is nil" do
       let(:data) { nil }
-      it "returns 0" do
-        is_expected.to be(0)
+      it "raises an error" do
+        expect { decoded_int }.to raise_error(ArgumentError)
       end
     end
 
     context "when data is empty" do
       let(:data) { '' }
 
-      it "returns nil" do
-        is_expected.to be_nil
+      it "raises an error" do
+        expect { decoded_int }.to raise_error(ArgumentError)
       end
     end
 
@@ -88,7 +88,7 @@
       let(:data) { "\x41" }
 
       it "raises an error" do
-        expect { decoded_lchar }.to raise_error(NoMethodError)
+        expect { decoded_lchar }.to raise_error(ArgumentError)
       end
     end
   end
@@ -205,16 +205,16 @@
       context "and no values" do
         let(:data) { "\x00\x00\x00\x02" }
 
-        it "returns an Array filled with nils" do
-          expect(described_class.decode_varray!(data) { |s| described_class.decode_int!(s) }).to eq([nil, nil])
+        it "raises an error" do
+          expect { described_class.decode_varray!(data) { |s| described_class.decode_int!(s) } }.to raise_error(ArgumentError)
         end
       end
 
       context "longer than available values" do
         let(:data) { "\x00\x00\x00\x02\x00\x00\x00\x41" }
 
-        it "returns Array padded with nils" do
-          expect(described_class.decode_varray!(data) { |s| described_class.decode_int!(s) }).to eq([0x41, nil])
+        it "raises an error" do
+          expect { described_class.decode_varray!(data) { |s| described_class.decode_int!(s) } }.to raise_error(ArgumentError)
         end
       end
     end