1 files changed, 11 insertions, 6 deletions
diff --git a/lib/soap/property.rb b/lib/soap/property.rb
index 113cc64f3c..882dcc6e28 100644
--- a/lib/soap/property.rb
+++ b/lib/soap/property.rb
@@ -32,6 +32,8 @@ module SOAP
 #     aaa.hhh = iii
 #
 class Property
+  FrozenError = (RUBY_VERSION >= "1.9.0") ? RuntimeError : TypeError
+
   include Enumerable
 
   module Util
@@ -78,8 +80,7 @@ class Property
       when LINE_REGEXP
 	key, value = $1.strip, $2.strip
 	key = "#{key_prefix}.#{key}" unless key_prefix.empty?
-	key = eval("\"#{key}\"")
-	value = eval("\"#{value}\"")
+	key, value = loadstr(key), loadstr(value)
 	self[key] = value
       else
 	raise TypeError.new(
@@ -190,7 +191,7 @@ protected
   def local_referent(key)
     check_lock(key)
     if propkey?(@store[key]) and @store[key].locked?
-      raise TypeError.new("cannot split any key from locked property")
+      raise FrozenError.new("cannot split any key from locked property")
     end
     @store[key]
   end
@@ -199,9 +200,9 @@ protected
     check_lock(key)
     if @locked
       if propkey?(value)
-	raise TypeError.new("cannot add any key to locked property")
+	raise FrozenError.new("cannot add any key to locked property")
       elsif propkey?(@store[key])
-	raise TypeError.new("cannot override any key in locked property")
+	raise FrozenError.new("cannot override any key in locked property")
       end
     end
     @store[key] = value
@@ -265,7 +266,7 @@ private
 
   def check_lock(key)
     if @locked and (key.nil? or !@store.key?(key))
-      raise TypeError.new("cannot add any key to locked property")
+      raise FrozenError.new("cannot add any key to locked property")
     end
   end
 
@@ -308,6 +309,10 @@ private
       load(f)
     end
   end
+
+  def loadstr(str)
+    str.gsub(/\\./) { |c| eval("\"#{c}\"") }
+  end
 end