[gimp] Issue #1607 - Fatal Crash on ACT Palette File Import
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Issue #1607 - Fatal Crash on ACT Palette File Import
- Date: Sun, 10 Jun 2018 05:48:21 +0000 (UTC)
commit ea6d997e56300e213be341ef6d2b4c7d8684615e
Author: Ell <ell_se yahoo com>
Date: Sun Jun 10 01:43:57 2018 -0400
Issue #1607 - Fatal Crash on ACT Palette File Import
... and various other palette formats
Change accidental 'G_IS_INPUT_STREAM (file)' argument validation to
'G_IS_INPUT_STREAM (input)'.
app/core/gimppalette-load.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c
index 9e70c0a31d..c2af11fc62 100644
--- a/app/core/gimppalette-load.c
+++ b/app/core/gimppalette-load.c
@@ -247,7 +247,7 @@ gimp_palette_load_act (GimpContext *context,
gsize bytes_read;
g_return_val_if_fail (G_IS_FILE (file), NULL);
- g_return_val_if_fail (G_IS_INPUT_STREAM (file), NULL);
+ g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
palette_name = g_path_get_basename (gimp_file_get_utf8_name (file));
@@ -283,7 +283,7 @@ gimp_palette_load_riff (GimpContext *context,
gsize bytes_read;
g_return_val_if_fail (G_IS_FILE (file), NULL);
- g_return_val_if_fail (G_IS_INPUT_STREAM (file), NULL);
+ g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
palette_name = g_path_get_basename (gimp_file_get_utf8_name (file));
@@ -332,7 +332,7 @@ gimp_palette_load_psp (GimpContext *context,
gchar **ascii_colors;
g_return_val_if_fail (G_IS_FILE (file), NULL);
- g_return_val_if_fail (G_IS_INPUT_STREAM (file), NULL);
+ g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
palette_name = g_path_get_basename (gimp_file_get_utf8_name (file));
@@ -418,7 +418,7 @@ gimp_palette_load_aco (GimpContext *context,
gsize bytes_read;
g_return_val_if_fail (G_IS_FILE (file), NULL);
- g_return_val_if_fail (G_IS_INPUT_STREAM (file), NULL);
+ g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
if (! g_input_stream_read_all (input, header, sizeof (header),
@@ -587,7 +587,7 @@ gimp_palette_load_css (GimpContext *context,
gchar *buf;
g_return_val_if_fail (G_IS_FILE (file), NULL);
- g_return_val_if_fail (G_IS_INPUT_STREAM (file), NULL);
+ g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
regex = g_regex_new (".*color.*:(?P<param>.*);", G_REGEX_CASELESS, 0, error);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]