From d0f211f61e022e443707075526f5b1fb72fad4a7 Mon Sep 17 00:00:00 2001
From: Miraty <miraty@antopie.org>
Date: Tue, 7 Jun 2022 00:05:07 +0200
Subject: [PATCH] Handle errors when generating QR codes

---
 index.php            | 9 ++++++++-
 locales/en.php       | 2 ++
 locales/fr.php       | 2 ++
 locales/oc.php       | 2 ++
 locales/template.php | 2 ++
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index d3744f1..9d35407 100755
--- a/index.php
+++ b/index.php
@@ -241,7 +241,14 @@ if ($validFormSubmitted) {
 			hexdec(substr($params['fgColor'],4,2))
 		));
 
-	$result = $qrCode->build();
+	try {
+		$result = $qrCode->build();
+	} catch (Exception $ex) {
+		http_response_code(500);
+		echo "<p><strong>" . $loc['error_generation'] . "</strong></p></body></html>";
+		error_log("LibreQR encountered an error while generating a QR code: " . $ex);
+		exit();
+	}
 
 	$dataUri = $result->getDataUri();
 
diff --git a/locales/en.php b/locales/en.php
index db6092b..bc5bef5 100644
--- a/locales/en.php
+++ b/locales/en.php
@@ -37,4 +37,6 @@ $loc = array(
 		<a href='https://en.wikipedia.org/wiki/QR_code' hreflang='en' rel='help external noreferrer'>QR code on Wikipedia</a>.
 	",
 	'metaText_legal' => "LibreQR " . LIBREQR_VERSION . " is a free software whose <a href='https://code.antopie.org/miraty/libreqr/' rel='external noreferrer'>source code</a> is available under the terms of the <abbr title='GNU Affero General Public License version 3 or any later version'><a href='LICENSE.html' hreflang='en' rel='license'>AGPLv3</a>+</abbr>.",
+
+	'error_generation' => "An error occurred while generating the QR code. Try with different parameters.",
 );
diff --git a/locales/fr.php b/locales/fr.php
index 8be97e2..c7af543 100644
--- a/locales/fr.php
+++ b/locales/fr.php
@@ -37,4 +37,6 @@ $loc = array(
 		<a href='https://fr.wikipedia.org/wiki/Code_QR' hreflang='fr' rel='help external noreferrer'>Code QR sur Wikipédia</a>.
 	",
 	'metaText_legal' => "LibreQR " . LIBREQR_VERSION . " est un logiciel libre dont le <a href='https://code.antopie.org/miraty/libreqr/' rel='external noreferrer'>code source</a> est disponible selon les termes de l'<abbr title='GNU Affero General Public License version 3 ou toute version ultérieure'><a href='LICENSE.html' hreflang='en' rel='license'>AGPLv3</a>+</abbr>.",
+
+	'error_generation' => "Une erreur a eu lieu lors de la génération du code QR. Essayez avec des paramètres différents.",
 );
diff --git a/locales/oc.php b/locales/oc.php
index 3c5821e..3e7a54e 100644
--- a/locales/oc.php
+++ b/locales/oc.php
@@ -37,4 +37,6 @@ $loc = array(
 		<a lang='ca' href='https://ca.wikipedia.org/wiki/Codi_QR' hreflang='ca' rel='help external noreferrer'>Còdi QR a la Wikipèdia</a>.
 	",
 	'metaText_legal' => "LibreQR " . LIBREQR_VERSION . " es un logicial liure que son <a href='https://code.antopie.org/miraty/libreqr/' rel='external noreferrer'>còdi font</a> es disponible jols tèrmes de la licéncia <abbr title='GNU Affero General Public License version 3 or any later version'><a href='LICENSE.html' hreflang='en' rel='license'>AGPLv3</a>+</abbr>.",
+
+	'error_generation' => "An error occurred while generating the QR code. Try with different parameters.",
 );
diff --git a/locales/template.php b/locales/template.php
index 0bb935f..7c63a2f 100644
--- a/locales/template.php
+++ b/locales/template.php
@@ -29,4 +29,6 @@ $loc = array(
 
 	'metaText_qr' => "metaText_qr",
 	'metaText_legal' => "metaText_legal",
+
+	'error_generation' => "error_generation",
 );