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

[Víctor R. Ruiz]

Víctor R. Ruiz has proposed merging lp:~vrruiz/nspluginwrapper/fix-raring into lp:nspluginwrapper.

Commit message:
Fix segfault in Raring.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #1111931 in nspluginwrapper (Ubuntu): "[raring] nspluginwrapper installation finishes with Segmentation fault (core dumped)"
  https://bugs.launchpad.net/ubuntu/+source/nspluginwrapper/+bug/1111931

For more details, see:
https://code.launchpad.net/~vrruiz/nspluginwrapper/fix-raring/+merge/165680

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]));

-- 
https://code.launchpad.net/~vrruiz/nspluginwrapper/fix-raring/+merge/165680
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~vrruiz/nspluginwrapper/fix-raring into lp:nspluginwrapper.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 548 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20130524/11458d33/attachment.diff>