From 37b11ce2e150615374ff098e8344b382b8d8e8c1 Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Fri, 24 Jan 2014 11:31:04 -0600 Subject: [PATCH 1/2] Use Class#kind_of? instead of == --- lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb index af2009b45a..5f8d3a45de 100644 --- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb +++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb @@ -341,7 +341,7 @@ class Util # See #unpack_pointer # def is_null_pointer(pointer) - if pointer.class == String + if pointer.class.kind_of? String pointer = unpack_pointer(pointer) end @@ -511,7 +511,7 @@ class Util # Returns true if the type passed describes a data structure, false otherwise def is_struct_type?(type) - return type.class == Array + return type.class.kind_of? Array end @@ -526,7 +526,7 @@ class Util return pointer_size end - if type.class == String + if type.class.kind_of? String if is_array_type?(type) element_type, length = split_array_type(type) return length * sizeof_type(element_type) From 1ff063d7deeca95d5dbaeda553b23683db942304 Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Fri, 24 Jan 2014 11:46:48 -0600 Subject: [PATCH 2/2] Test the object not the class duhhh --- lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb index 5f8d3a45de..0b21beed5f 100644 --- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb +++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb @@ -341,7 +341,7 @@ class Util # See #unpack_pointer # def is_null_pointer(pointer) - if pointer.class.kind_of? String + if pointer.kind_of? String pointer = unpack_pointer(pointer) end @@ -511,7 +511,7 @@ class Util # Returns true if the type passed describes a data structure, false otherwise def is_struct_type?(type) - return type.class.kind_of? Array + return type.kind_of? Array end @@ -526,7 +526,7 @@ class Util return pointer_size end - if type.class.kind_of? String + if type.kind_of? String if is_array_type?(type) element_type, length = split_array_type(type) return length * sizeof_type(element_type)