Merge lp:~vrruiz/nspluginwrapper/fix-raring into lp:nspluginwrapper

[Víctor R. Ruiz]

Fix segfault in Raring.

nspluginwrapper segfaults in Raring. This happens because get_env_plugin_dirs doesn't set correctly the count when NSPLUGIN_DIRS env variable is not set in 005_process_env_dirs.diff:

+const gchar **get_env_plugin_dirs(int *count)
+{
+ char *ns_plugin_dir = getenv("NSPLUGIN_DIRS");
+ *count = 0;
+ if (ns_plugin_dir == NULL)
+ return NULL;

Segfault is produced in get_mozilla_plugin_dirs n_env_dirs, when accessing dirs variable (malloc doesn't work correctly, because n_env_dirs is not set to 0).

+ const gchar **env_dirs = get_env_plugin_dirs(&n_env_dirs);
+ const char **dirs = malloc((n_default_dirs + n_env_dirs + 2) * sizeof(dirs[0]));

[lp:~vrruiz/nspluginwrapper/fix-raring]

58. By Víctor R. Ruiz on 2013-05-29

Fix segfault in raring

[Brian Murray (brian-murray)]

This did not seem to fix the crash in raring for me. nspluginwrapper --list still crashes and purging nspluginwrapper and nspluginviewer and then reinstalling them still causes a coredump.

review: Needs Fixing

Unmerged revisions

58. By Víctor R. Ruiz on 2013-05-29

Fix segfault in raring

57. By Víctor R. Ruiz on 2013-05-24

Fix segfault in Raring

=== modified file 'debian/patches/005_process_env_dirs.diff'
--- debian/patches/005_process_env_dirs.diff	2009-04-02 14:37:55 +0000
+++ debian/patches/005_process_env_dirs.diff	2013-05-29 16:22:25 +0000
@@ -22,10 +22,10 @@
  
 +const gchar **get_env_plugin_dirs(int *count)
 +{
++  *count = 0;
 +  char *ns_plugin_dir = getenv("NSPLUGIN_DIRS");
 +  if (ns_plugin_dir == NULL)
 +    return NULL;
-+  *count = 0;
 +  const gchar **ns_plugin_dirs = g_strsplit((gchar *)ns_plugin_dir, ":", -1);
 +  const gchar **iter = ns_plugin_dirs;
 +  while (*iter) {