[gimp] Bug 772025 - Incomplete toolrc file causes GIMP to hang



commit ada5fe977b6f7aee555e7e76b18afe996244d949
Author: Michael Natterer <mitch gimp org>
Date:   Wed Sep 28 18:32:25 2016 +0200

    Bug 772025 - Incomplete toolrc file causes GIMP to hang
    
    gimp_config_deserialize_properties(): don't loop infinitely when
    encountering EOF in a truncated file.

 libgimpconfig/gimpconfig-deserialize.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/libgimpconfig/gimpconfig-deserialize.c b/libgimpconfig/gimpconfig-deserialize.c
index 25f21d7..141147b 100644
--- a/libgimpconfig/gimpconfig-deserialize.c
+++ b/libgimpconfig/gimpconfig-deserialize.c
@@ -140,7 +140,6 @@ gimp_config_deserialize_properties (GimpConfig *config,
   guint          scope_id;
   guint          old_scope_id;
   GTokenType     token;
-  GTokenType     next;
 
   g_return_val_if_fail (GIMP_IS_CONFIG (config), FALSE);
 
@@ -172,7 +171,10 @@ gimp_config_deserialize_properties (GimpConfig *config,
 
   while (TRUE)
     {
-      next = g_scanner_peek_next_token (scanner);
+      GTokenType next = g_scanner_peek_next_token (scanner);
+
+      if (next == G_TOKEN_EOF)
+        break;
 
       if (G_UNLIKELY (next != token &&
                       ! (token == G_TOKEN_SYMBOL &&


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]