Merge remote-tracking branch 'origin/hotfix/0.9.0.3' into rails-3-develop

Conflicts:
    Rakefile
    app/models/contact_mailer.rb
    spec/models/contact_mailer_spec.rb

4 files changed, 7 insertions, 2 deletions

diff --git a/Rakefile b/Rakefile
index 6e86b06f6..d9a53fc69 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,5 +3,5 @@
 
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
-
 Alaveteli::Application.load_tasks
+Dir[File.join(File.dirname(__FILE__),'commonlib','rblib','tests','*.rake')].each { |file| load(file) }
diff --git a/commonlib b/commonlib
-Subproject d34573a26f0894c28ac118fa27c6945223fcf85
+Subproject 3f57d96fe765242c3a7082d386b5763b2e1ca73
diff --git a/lib/alaveteli_external_command.rb b/lib/alaveteli_external_command.rb
index ac91a5867..fbdee8a62 100644
--- a/lib/alaveteli_external_command.rb
+++ b/lib/alaveteli_external_command.rb
@@ -8,6 +8,7 @@ module AlaveteliExternalCommand
         # :stdin_string - stdin string to pass to the process
         # :binary_output - boolean flag for treating the output as binary or text (only significant
         #                  ruby 1.9 and above)
+        # :memory_limit - maximum amount of memory (in bytes) available to the process
         def run(program_name, *args)
             # Run an external program, and return its output.
             # Standard error is suppressed unless the program
@@ -38,6 +39,9 @@ module AlaveteliExternalCommand
             if opts.has_key? :binary_output
                 xc.binary_mode = opts[:binary_output]
             end
+            if opts.has_key? :memory_limit
+                xc.memory_limit = opts[:memory_limit]
+            end
             xc.run(opts[:stdin_string] || "", opts[:env] || {})
 
             if xc.status != 0
diff --git a/lib/mail_handler/mail_handler.rb b/lib/mail_handler/mail_handler.rb
index d9ebee854..22ba26b97 100644
--- a/lib/mail_handler/mail_handler.rb
+++ b/lib/mail_handler/mail_handler.rb
@@ -77,7 +77,8 @@ module MailHandler
             tempfile.flush
             default_params = { :append_to => text, :binary_output => false }
             if content_type == 'application/vnd.ms-word'
-                AlaveteliExternalCommand.run("wvText", tempfile.path, tempfile.path + ".txt")
+                AlaveteliExternalCommand.run("wvText", tempfile.path, tempfile.path + ".txt",
+                                             { :memory_limit => 536870912 } )
                 # Try catdoc if we get into trouble (e.g. for InfoRequestEvent 2701)
                 if not File.exists?(tempfile.path + ".txt")
                     AlaveteliExternalCommand.run("catdoc", tempfile.path, default_params)