Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 10 Sep 2013 21:10:44 -0400
changeset 146484 9b4a6ac7f7e729d64260e31b5c0e866d56ce623f
parent 146483 aa67ba538e9f92b3c55700c35d058f145cbead58 (current diff)
parent 146458 f73bed2856a8eeae0dbeb395f50718cf7ec23942 (diff)
child 146485 9e5d584bc36c0c09d9298ae05c9a6b9a53fbbcae
push id25261
push usercbook@mozilla.com
push dateWed, 11 Sep 2013 07:31:01 +0000
treeherdermozilla-central@f9e8e8ce552c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound.
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -1390,17 +1390,17 @@ res/drawable-xxhdpi/icon.png: $(ICON_PAT
 	$(RM) -r $(@D)
 	$(NSINSTALL) -D $(@D)
 	$(TOUCH) $@
 
 $(RESOURCES): $(call mkdir_deps,$(RES_DIRS)) $(subst res/,$(srcdir)/resources/,$(RESOURCES))
 	@echo "creating $@"
 	$(NSINSTALL) $(subst res/,$(srcdir)/resources/,$@) $(dir $@)
 
-res/values/strings.xml: $(call mkdir_deps,$(RES_DIRS))
+res/values/strings.xml: $(call mkdir_deps,res/values)
 	$(MAKE) -C locales
 
 # With multilocale builds, there will be multiple strings.xml files. We need to
 # rebuild gecko.ap_ if any of them change.
 MULTILOCALE_STRINGS_XML_FILES := $(wildcard res/values-*/strings.xml)
 all_resources = \
   res/drawable-mdpi/icon.png \
   res/drawable-hdpi/icon.png \
--- a/mozglue/linker/SeekableZStream.cpp
+++ b/mozglue/linker/SeekableZStream.cpp
@@ -175,17 +175,17 @@ BCJ_X86_filter(off_t offset, SeekableZSt
     { true, true, true, false, true, false, false, false };
 
   static const uint32_t MASK_TO_BIT_NUMBER[8] =
     { 0, 1, 2, 2, 3, 3, 3, 3 };
 
   uint32_t prev_mask = 0;
   uint32_t prev_pos = 0;
 
-  for (size_t i = 0; i <= size - 5;) {
+  for (size_t i = 0; i + 5 <= size;) {
     uint8_t b = buf[i];
     if (b != 0xe8 && b != 0xe9) {
       ++i;
       continue;
     }
 
     const uint32_t off = offset + (uint32_t)(i) - prev_pos;
     prev_pos = offset + (uint32_t)(i);