From 66787c68b96e9e31e9081c25f793e69d9ae789fe Mon Sep 17 00:00:00 2001 From: Ian Chard Date: Wed, 15 May 2013 09:33:30 +0100 Subject: Limit memory available to wvText, which calls elinks --- lib/mail_handler/mail_handler.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/mail_handler/mail_handler.rb') diff --git a/lib/mail_handler/mail_handler.rb b/lib/mail_handler/mail_handler.rb index 8b227b9ca..cd5abfab7 100644 --- a/lib/mail_handler/mail_handler.rb +++ b/lib/mail_handler/mail_handler.rb @@ -84,7 +84,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) -- cgit v1.2.3