Bug 1273480 - avoid dead code on |status| assignment. r?jorendorff draft
authorAndi-Bogdan Postelnicu <bogdan.postelnicu@softvision.ro>
Tue, 17 May 2016 15:33:25 +0300
changeset 367824 3f6c99837c5d2ad1a1c47e6a29d1861174d9aef3
parent 367573 a884b96685aa13b65601feddb24e5f85ba861561
child 521115 fd8036e5297c071f94c619d659b1eee818780f7e
push id18362
push userBogdan.Postelnicu@softvision.ro
push dateTue, 17 May 2016 12:36:16 +0000
reviewersjorendorff
bugs1273480
milestone49.0a1
Bug 1273480 - avoid dead code on |status| assignment. r?jorendorff MozReview-Commit-ID: 7I4wqGSBe64
js/src/jsfun.cpp
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -1538,18 +1538,18 @@ UnescapeSubstr(TextChar* text, size_t st
                     code = JS7_UNHEX(text[i + 1]);
                     code = (code << 4) + JS7_UNHEX(text[i + 2]);
                     code = (code << 4) + JS7_UNHEX(text[i + 3]);
                     code = (code << 4) + JS7_UNHEX(text[i + 4]);
                     i += 4;
                     if (code < 0x10000) {
                         status = buf.append((char16_t)code);
                     } else {
-                        status = status && buf.append((char16_t)((code - 0x10000) / 1024 + 0xD800));
-                        status = status && buf.append((char16_t)(((code - 0x10000) % 1024) + 0xDC00));
+                        status = buf.append((char16_t)((code - 0x10000) / 1024 + 0xD800)) &&
+                            buf.append((char16_t)(((code - 0x10000) % 1024) + 0xDC00));
                     }
                     break;
                 }
             }
             if (!status)
                 return false;
         } else {
             if (!buf.append(text[i]))