Force clobber

and mapping.

CLOBBER

@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Clobber for removing invalid track files with wildcards
+Clobber for NSS update

dom/script/ModuleLoadRequest.cpp

@@ -148,6 +148,11 @@ ModuleLoadRequest::LoadFailed()
   // We failed to load the source text or an error occurred unrelated to the
   // content of the module (e.g. OOM).
 
+  if (IsCanceled()) {
+    return;
+  }
+
+  MOZ_ASSERT(!IsReadyToRun());
   MOZ_ASSERT(!mModuleScript);
 
   Cancel();

js/src/irregexp/RegExpCharRanges.cpp

@@ -550,7 +550,7 @@ bool IsSupportedBinaryProperty(UProperty property) {
         case UCHAR_EMOJI_MODIFIER_BASE:
         case UCHAR_EMOJI_MODIFIER:
         case UCHAR_EMOJI_PRESENTATION:
-        // case UCHAR_EXTENDED_PICTOGRAPHIC:
+        case UCHAR_EXTENDED_PICTOGRAPHIC:
         case UCHAR_EXTENDER:
         case UCHAR_GRAPHEME_BASE:
         case UCHAR_GRAPHEME_EXTEND:

js/src/irregexp/RegExpParser.cpp

@@ -904,7 +904,7 @@ RegExpParser<CharT>::ParseCharacterClass()
                 if (char_class_1 == kNoCharClass)
                     ranges->append(CharacterRange::Singleton(char_1));
                 ranges->append(CharacterRange::Singleton('-'));
-                if (char_class_1 == kNoCharClass)
+                if (char_class_2 == kNoCharClass)
                     ranges->append(CharacterRange::Singleton(char_2));
                 continue;
             }

js/src/vm/RegExpObject.cpp

@@ -970,6 +970,7 @@ RegExpShared::trace(JSTracer* trc)
     TraceNullableEdge(trc, &source, "RegExpShared source");
     for (auto& comp : compilationArray)
         TraceNullableEdge(trc, &comp.jitCode, "RegExpShared code");
+    TraceNullableEdge(trc, &groupsTemplate_, "RegExpShared groupsTemplate");
 }
 
 bool

security/nss/coreconf/coreconf.dep

@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-

security/nss/lib/nss/nss.h

@@ -22,10 +22,10 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION "3.52.8" _NSS_CUSTOMIZED
+#define NSS_VERSION "3.52.9" _NSS_CUSTOMIZED
 #define NSS_VMAJOR 3
 #define NSS_VMINOR 52
-#define NSS_VPATCH 8
+#define NSS_VPATCH 9
 #define NSS_VBUILD 0
 #define NSS_BETA PR_FALSE
 

security/nss/lib/pkcs12/p12d.c

@@ -341,27 +341,38 @@ sec_pkcs12_decoder_safe_bag_update(void *arg, const char *data,
      * and that there are no errors.  If so, just return rather
      * than continuing to process.
      */
-    if (!safeContentsCtx || !safeContentsCtx->p12dcx ||
-        safeContentsCtx->p12dcx->error || safeContentsCtx->skipCurrentSafeBag) {
+    if (!safeContentsCtx || !safeContentsCtx->p12dcx || safeContentsCtx->skipCurrentSafeBag) {
         return;
     }
     p12dcx = safeContentsCtx->p12dcx;
 
+    /* make sure that there are no errors and we are not skipping the current safeBag */
+    if (p12dcx->error || safeContentsCtx->skipCurrentSafeBag) {
+        goto loser;
+    }
+
     rv = SEC_ASN1DecoderUpdate(safeContentsCtx->currentSafeBagA1Dcx, data, len);
     if (rv != SECSuccess) {
         p12dcx->errorValue = PORT_GetError();
+        p12dcx->error = PR_TRUE;
+        goto loser;
+    }
+
+    /* The update may have set safeContentsCtx->skipCurrentSafeBag, and we
+     * may not get another opportunity to clean up the decoder context.
+     */
+    if (safeContentsCtx->skipCurrentSafeBag) {
         goto loser;
     }
 
     return;
 
 loser:
-    /* set the error, and finish the decoder context.  because there
+    /* Finish the decoder context. Because there
      * is not a way of returning an error message, it may be worth
      * while to do a check higher up and finish any decoding contexts
      * that are still open.
      */
-    p12dcx->error = PR_TRUE;
     SEC_ASN1DecoderFinish(safeContentsCtx->currentSafeBagA1Dcx);
     safeContentsCtx->currentSafeBagA1Dcx = NULL;
     return;

security/nss/lib/pkcs12/p12t.h

@@ -73,6 +73,7 @@ struct sec_PKCS12SafeBagStr {
         sec_PKCS12CRLBag *crlBag;
         sec_PKCS12SecretBag *secretBag;
         sec_PKCS12SafeContents *safeContents;
+        SECItem *unknownBag;
     } safeBagContent;
 
     sec_PKCS12Attribute **attribs;

security/nss/lib/pkcs12/p12tmpl.c

@@ -30,12 +30,12 @@ sec_pkcs12_choose_safe_bag_type(void *src_or_dest, PRBool encoding)
 
     oiddata = SECOID_FindOID(&safeBag->safeBagType);
     if (oiddata == NULL) {
-        return SEC_ASN1_GET(SEC_AnyTemplate);
+        return SEC_ASN1_GET(SEC_PointerToAnyTemplate);
     }
 
     switch (oiddata->offset) {
         default:
-            theTemplate = SEC_ASN1_GET(SEC_AnyTemplate);
+            theTemplate = SEC_ASN1_GET(SEC_PointerToAnyTemplate);
             break;
         case SEC_OID_PKCS12_V1_KEY_BAG_ID:
             theTemplate = SEC_ASN1_GET(SECKEY_PointerToPrivateKeyInfoTemplate);

security/nss/lib/softoken/softkver.h

@@ -17,10 +17,10 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION "3.52.8" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION "3.52.9" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR 3
 #define SOFTOKEN_VMINOR 52
-#define SOFTOKEN_VPATCH 8
+#define SOFTOKEN_VPATCH 9
 #define SOFTOKEN_VBUILD 0
 #define SOFTOKEN_BETA PR_FALSE
 

security/nss/lib/util/nssutil.h

@@ -19,10 +19,10 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION "3.52.8"
+#define NSSUTIL_VERSION "3.52.9"
 #define NSSUTIL_VMAJOR 3
 #define NSSUTIL_VMINOR 52
-#define NSSUTIL_VPATCH 8
+#define NSSUTIL_VPATCH 9
 #define NSSUTIL_VBUILD 0
 #define NSSUTIL_BETA PR_FALSE
 

widget/windows/TaskbarPreview.cpp

@@ -357,32 +357,38 @@ TaskbarPreviewCallback::Done(nsISupports *aCanvas, bool aDrawBorder) {
   }
   RefPtr<gfxWindowsSurface> target = new gfxWindowsSurface(source->GetSize(),
                                                            gfx::SurfaceFormat::A8R8G8B8_UINT32);
-  if (!target) {
+  if (target->CairoStatus() != CAIRO_STATUS_SUCCESS) {
     return NS_ERROR_FAILURE;
   }
 
-  RefPtr<gfx::DataSourceSurface> srcSurface = source->GetDataSurface();
+  using DataSrcSurf = gfx::DataSourceSurface;
+  RefPtr<DataSrcSurf> srcSurface = source->GetDataSurface();
   RefPtr<gfxImageSurface> imageSurface = target->GetAsImageSurface();
   if (!srcSurface || !imageSurface) {
     return NS_ERROR_FAILURE;
   }
 
-  gfx::DataSourceSurface::MappedSurface sourceMap;
-  srcSurface->Map(gfx::DataSourceSurface::READ, &sourceMap);
-  mozilla::gfx::CopySurfaceDataToPackedArray(sourceMap.mData,
-                                             imageSurface->Data(),
-                                             srcSurface->GetSize(),
-                                             sourceMap.mStride,
-                                             BytesPerPixel(srcSurface->GetFormat()));
-  srcSurface->Unmap();
+  DataSrcSurf::ScopedMap const sourceMap(srcSurface, DataSrcSurf::READ);
+  if (sourceMap.IsMapped()) {
+    mozilla::gfx::CopySurfaceDataToPackedArray(sourceMap.GetData(),
+                                               imageSurface->Data(),
+                                               srcSurface->GetSize(),
+                                               sourceMap.GetStride(),
+                                               BytesPerPixel(srcSurface->GetFormat()));
+  } else if (source->GetSize().IsEmpty()) {
+    // A zero-size source-surface probably shouldn't happen, but is harmless
+    // here. Fall through.
+  } else {
+    return NS_ERROR_FAILURE;
+  }
 
   HDC hDC = target->GetDC();
   HBITMAP hBitmap = (HBITMAP)GetCurrentObject(hDC, OBJ_BITMAP);
 
   DWORD flags = aDrawBorder ? DWM_SIT_DISPLAYFRAME : 0;
-  POINT pptClient = { 0, 0 };
   HRESULT hr;
   if (!mIsThumbnail) {
+    POINT pptClient = { 0, 0 };
     hr = DwmSetIconicLivePreviewBitmap(mPreview->PreviewWindow(),
                                        hBitmap, &pptClient, flags);
   } else {
@@ -390,6 +396,7 @@ TaskbarPreviewCallback::Done(nsISupports *aCanvas, bool aDrawBorder) {
                                hBitmap, flags);
   }
   MOZ_ASSERT(SUCCEEDED(hr));
+  mozilla::Unused << hr;
   return NS_OK;
 }