[gnome-shell] browser-plugin: Prevent a copy when checking for valid extension UUIDs
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] browser-plugin: Prevent a copy when checking for valid extension UUIDs
- Date: Mon, 2 Jul 2012 22:30:31 +0000 (UTC)
commit 67689f1a6d3998a23fd313214959ce8adf7425e2
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Jun 15 17:46:33 2012 -0400
browser-plugin: Prevent a copy when checking for valid extension UUIDs
Instead of using g_strndup to copy the NPString that gets passed to us
by the plugin host, just use the equally-as-good NPString directly. We
still need to copy the string when passing it over DBus, as there's no
easy way to construct a string GVariant from a length-prefixed string.
https://bugzilla.gnome.org/show_bug.cgi?id=679099
browser-plugin/browser-plugin.c | 59 ++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 35 deletions(-)
---
diff --git a/browser-plugin/browser-plugin.c b/browser-plugin/browser-plugin.c
index d16f805..8e710a0 100644
--- a/browser-plugin/browser-plugin.c
+++ b/browser-plugin/browser-plugin.c
@@ -399,13 +399,13 @@ plugin_object_has_method (NPObject *npobj,
}
static inline gboolean
-uuid_is_valid (const gchar *uuid)
+uuid_is_valid (NPString string)
{
gsize i;
- for (i = 0; uuid[i]; i ++)
+ for (i = 0; i < string.UTF8Length; i++)
{
- gchar c = uuid[i];
+ gchar c = string.UTF8Characters[i];
if (c < 32 || c >= 127)
return FALSE;
@@ -499,17 +499,15 @@ plugin_enable_extension (PluginObject *obj,
gboolean enabled)
{
gboolean ret;
- gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
+ gchar *uuid_str;
gsize length;
gchar **uuids;
const gchar **new_uuids;
- if (!uuid_is_valid (uuid_str))
- {
- g_free (uuid_str);
- return FALSE;
- }
+ if (!uuid_is_valid (uuid))
+ return FALSE;
+ uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
uuids = g_settings_get_strv (obj->settings, ENABLED_EXTENSIONS_KEY);
length = g_strv_length (uuids);
@@ -551,13 +549,12 @@ static gboolean
plugin_install_extension (PluginObject *obj,
NPString uuid)
{
- gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
+ gchar *uuid_str;
- if (!uuid_is_valid (uuid_str))
- {
- g_free (uuid_str);
- return FALSE;
- }
+ if (!uuid_is_valid (uuid))
+ return FALSE;
+
+ uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
g_dbus_proxy_call (obj->proxy,
"InstallRemoteExtension",
@@ -582,12 +579,10 @@ plugin_uninstall_extension (PluginObject *obj,
GVariant *res;
gchar *uuid_str;
+ if (!uuid_is_valid (uuid))
+ return FALSE;
+
uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
- if (!uuid_is_valid (uuid_str))
- {
- g_free (uuid_str);
- return FALSE;
- }
res = g_dbus_proxy_call_sync (obj->proxy,
"UninstallExtension",
@@ -619,12 +614,10 @@ plugin_get_info (PluginObject *obj,
GVariant *res;
gchar *uuid_str;
+ if (!uuid_is_valid (uuid))
+ return FALSE;
+
uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
- if (!uuid_is_valid (uuid_str))
- {
- g_free (uuid_str);
- return FALSE;
- }
res = g_dbus_proxy_call_sync (obj->proxy,
"GetExtensionInfo",
@@ -655,12 +648,10 @@ plugin_get_errors (PluginObject *obj,
GVariant *res;
gchar *uuid_str;
+ if (!uuid_is_valid (uuid))
+ return FALSE;
+
uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
- if (!uuid_is_valid (uuid_str))
- {
- g_free (uuid_str);
- return FALSE;
- }
res = g_dbus_proxy_call_sync (obj->proxy,
"GetExtensionErrors",
@@ -689,12 +680,10 @@ plugin_launch_extension_prefs (PluginObject *obj,
{
gchar *uuid_str;
+ if (!uuid_is_valid (uuid))
+ return FALSE;
+
uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length);
- if (!uuid_is_valid (uuid_str))
- {
- g_free (uuid_str);
- return FALSE;
- }
g_dbus_proxy_call (obj->proxy,
"LaunchExtensionPrefs",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]