From 8654991333cb10624b448d6b8bcf8b4adb2537ec Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Wed, 22 Apr 2009 10:26:19 +0000
Subject: [PATCH] * src/ejabberd_captcha.erl: If a problem appears while
 obtaining the image, show error message (EJAB-895)

SVN Revision: 2030
---
 ChangeLog                | 3 +++
 src/ejabberd_captcha.erl | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ef21d62c5..d62d402fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-04-22  Badlop  <badlop@process-one.net>
 
+	* src/ejabberd_captcha.erl: If a problem appears while obtaining
+	the image, show error message (EJAB-895)
+
 	* src/Makefile.in: Install example script captcha.sh (EJAB-895)
 
 	* src/ejabberd.cfg.example: Add CAPTCHA options (EJAB-895)
diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl
index d8106d3fd..a51aef4ce 100644
--- a/src/ejabberd_captcha.erl
+++ b/src/ejabberd_captcha.erl
@@ -283,6 +283,11 @@ create_image(Key) ->
 	    {ok, "image/jpeg", Key, Img};
 	{ok, <<$G, $I, $F, $8, X, $a, _/binary>> = Img} when X==$7; X==$9 ->
 	    {ok, "image/gif", Key, Img};
+	{error, enodata = Reason} ->
+	    ?ERROR_MSG("Failed to process output from \"~s\". "
+		       "Maybe ImageMagick's Convert program is not installed.",
+		       [Cmd]),
+	    {error, Reason};
 	{error, Reason} ->
 	    ?ERROR_MSG("Failed to process an output from \"~s\": ~p",
 		       [Cmd, Reason]),