commit 396d0b5059eb0aa1b01655f1238384a06ccdee40 Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Mar 19 07:50:29 2016 -0400

Rebase gmploader-sandbox.mozpatch --- projects/instantbird/gmploader-sandbox.mozpatch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/instantbird/gmploader-sandbox.mozpatch b/projects/instantbird/gmploader-sandbox.mozpatch index a9d167c..5940a6f 100644 --- a/projects/instantbird/gmploader-sandbox.mozpatch +++ b/projects/instantbird/gmploader-sandbox.mozpatch @@ -1,12 +1,12 @@ diff --git a/dom/media/gmp/GMPLoader.cpp b/dom/media/gmp/GMPLoader.cpp --- a/dom/media/gmp/GMPLoader.cpp +++ b/dom/media/gmp/GMPLoader.cpp -@@ -227,7 +227,7 @@ +@@ -242,7 +242,7 @@

// Load the GMP. PRLibSpec libSpec; -#ifdef XP_WIN +#if defined(XP_WIN) && defined(MOZ_SANDBOX) - libSpec.value.pathname_u = widePath; - libSpec.type = PR_LibSpec_PathnameU; - #else + int pathLen = MultiByteToWideChar(CP_UTF8, 0, aUTF8LibPath, -1, nullptr, 0); + if (pathLen == 0) { + return false;