mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-18 04:18:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

[493/906] glfiltershader: fix crash when loading shader file

Browse source 
Just use g_file_get_contents() instead of home-made file loading.
Fixes two issues - one is that we should pass "r" to fopen and
not O_RDONLY, the other is that an incorrect variable was used
to read the file length, leading to an empty shader file.

Spotted by: Wang Xin-yu (王昕宇) <comicfans44@gmail.com>

https://bugzilla.gnome.org/show_bug.cgi?id=702844
https://bugzilla.gnome.org/show_bug.cgi?id=702845

Conflicts:
	gst/gl/gstglfiltershader.c
This commit is contained in:
Tim-Philipp Müller 2013-06-28 00:04:43 +01:00 committed by Matthew Waters
parent 201d3992d2
commit 5b9e4b8282
1 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gst/gl/gstglfiltershader.c
View file

@ -254,44 +254,20 @@ gst_gl_filtershader_get_property (GObject * object, guint prop_id,
}
static int
gst_gl_filtershader_load_file (char *filename, char **storage)
gst_gl_filtershader_load_file (const gchar * filename, gchar ** storage)
{
GError *err = NULL;
gchar *old_storage = *storage;
size_t count;
size_t bytes;
FILE *f;
// read the filter from file
GST_INFO ("loading file: %s", filename);
f = fopen (filename, O_RDONLY);
if (f == NULL) {
GST_ERROR ("could not open file: %s", filename);
if (!g_file_get_contents (filename, storage, NULL, &err)) {
GST_ERROR ("could not open file '%s':", filename, err->message);
g_error_free (err);
return -1;
}
if (*storage) {
g_free (*storage);
*storage = 0;
}
count = fseek (f, 0, SEEK_END);
*storage = g_malloc (count + 1);
if (!*storage) {
GST_ERROR ("g_malloc failed: %u", count);
return -1;
}
fseek (f, 0, SEEK_SET);
bytes = fread ((void *) *storage, sizeof (char), count, f);
if (bytes != count) {
GST_ERROR ("read failed: %u/%u", bytes, count);
return -1;
}
((char *) *storage)[count] = 0;
if (f)
fclose (f);
GST_INFO ("read: %u", bytes);
g_free (old_storage);
GST_INFO ("read: %d bytes", (int) strlen (*storage));
return 0;
}