mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 00:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

registrychunks: Fix off-by-one error. Improve debug.

Browse source 
Fix an off-by-one error in the size guard for unpack_element, and
improve various debug statements in the failure paths.

Also, swap some g_new0 to g_malloc0 for the fun of it.
This commit is contained in:
Jan Schmidt 2009-10-08 02:01:54 +01:00
parent 0c3a8165b6
commit 83252f42c9
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/gstregistrychunks.c
View file

@ -61,8 +61,11 @@ _strnlen (const gchar * str, gint maxlen)
/* Macros */ /* Macros */
#define unpack_element(inptr, outptr, element, endptr, error_label) G_STMT_START{ \ #define unpack_element(inptr, outptr, element, endptr, error_label) G_STMT_START{ \
if (inptr + sizeof(element) >= endptr) \ if (inptr + sizeof(element) > endptr) { \
GST_ERROR ("Failed reading element " G_STRINGIFY (element) \
". Have %d bytes need %d", endptr - inptr, sizeof(element)); \
goto error_label; \ goto error_label; \
} \
outptr = (element *) inptr; \ outptr = (element *) inptr; \
inptr += sizeof (element); \ inptr += sizeof (element); \
}G_STMT_END }G_STMT_END
@ -335,7 +338,7 @@ gst_registry_chunks_save_plugin_dep (GList ** list, GstPluginDep * dep)
GstRegistryChunk *chk; GstRegistryChunk *chk;
gchar **s; gchar **s;
ed = g_new0 (GstRegistryChunkDep, 1); ed = g_malloc0 (sizeof (GstRegistryChunkDep));
chk = gst_registry_chunks_make_data (ed, sizeof (GstRegistryChunkDep)); chk = gst_registry_chunks_make_data (ed, sizeof (GstRegistryChunkDep));
ed->flags = dep->flags; ed->flags = dep->flags;
@ -676,7 +679,7 @@ gst_registry_chunks_load_plugin_dep (GstPlugin * plugin, gchar ** in,
GST_LOG_OBJECT (plugin, "Unpacking GstRegistryChunkDep from %p", *in); GST_LOG_OBJECT (plugin, "Unpacking GstRegistryChunkDep from %p", *in);
unpack_element (*in, d, GstRegistryChunkDep, end, fail); unpack_element (*in, d, GstRegistryChunkDep, end, fail);
dep = g_new0 (GstPluginDep, 1); dep = g_malloc0 (sizeof (GstPluginDep));
dep->env_hash = d->env_hash; dep->env_hash = d->env_hash;
dep->stat_hash = d->stat_hash; dep->stat_hash = d->stat_hash;
@ -776,7 +779,8 @@ _priv_gst_registry_chunks_load_plugin (GstRegistry * registry, gchar ** in,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (G_UNLIKELY (!gst_registry_chunks_load_feature (registry, in, end, if (G_UNLIKELY (!gst_registry_chunks_load_feature (registry, in, end,
plugin->desc.name))) { plugin->desc.name))) {
GST_ERROR ("Error while loading binary feature"); GST_ERROR ("Error while loading binary feature for plugin '%s'",
GST_STR_NULL (plugin->desc.name));
gst_registry_remove_plugin (registry, plugin); gst_registry_remove_plugin (registry, plugin);
goto fail; goto fail;
} }
@ -785,7 +789,8 @@ _priv_gst_registry_chunks_load_plugin (GstRegistry * registry, gchar ** in,
/* Load external plugin dependencies */ /* Load external plugin dependencies */
for (i = 0; i < pe->n_deps; ++i) { for (i = 0; i < pe->n_deps; ++i) {
if (G_UNLIKELY (!gst_registry_chunks_load_plugin_dep (plugin, in, end))) { if (G_UNLIKELY (!gst_registry_chunks_load_plugin_dep (plugin, in, end))) {
GST_ERROR_OBJECT (plugin, "Could not read external plugin dependency"); GST_ERROR_OBJECT (plugin, "Could not read external plugin dependency "
"for plugin '%s'", GST_STR_NULL (plugin->desc.name));
gst_registry_remove_plugin (registry, plugin); gst_registry_remove_plugin (registry, plugin);
goto fail; goto fail;
} }