Bug 1384848 - Remove dead code in XPCConvert.cpp r?froydnj draft
authorSylvestre Ledru <sledru@mozilla.com>
Thu, 27 Jul 2017 09:43:06 +0200
changeset 616620 c82c3b8e11913944a613bb94bc6702f1783c51eb
parent 615858 db2dc4f23c4a087a3d273d35e32c742970763514
child 639529 85725aa50fd35ebfeceb85208b4ce4822eb5f44a
push id70744
push userbmo:sledru@mozilla.com
push dateThu, 27 Jul 2017 07:43:40 +0000
reviewersfroydnj
bugs1384848
milestone56.0a1
Bug 1384848 - Remove dead code in XPCConvert.cpp r?froydnj MozReview-Commit-ID: D6kCUtqfIwo
js/xpconnect/src/XPCConvert.cpp
--- a/js/xpconnect/src/XPCConvert.cpp
+++ b/js/xpconnect/src/XPCConvert.cpp
@@ -1703,24 +1703,16 @@ XPCConvert::JSStringWithSize2Native(void
         case nsXPTType::T_PSTRING_SIZE_IS:
         {
             if (s.isUndefined() || s.isNull()) {
                 if (0 != count) {
                     if (pErr)
                         *pErr = NS_ERROR_XPC_NOT_ENOUGH_CHARS_IN_STRING;
                     return false;
                 }
-                if (0 != count) {
-                    len = (count + 1) * sizeof(char);
-                    if (!(*((void**)d) = moz_xmalloc(len)))
-                        return false;
-                    return true;
-                }
-                // else ...
-
                 *((char**)d) = nullptr;
                 return true;
             }
 
             JSString* str = ToString(cx, s);
             if (!str) {
                 return false;
             }