Commit Graph

131 Commits

Author SHA1 Message Date
Hiroyuki Ikezoe
279cfef515 Bug 1167627 - Part 2: Use mozinfo in modules/libmar/. r=rstrong 2015-10-11 21:48:00 +02:00
Matt Howell
2a8b1b4fe3 Bug 1209551 - Don't read past the end of a buffer in libmar
The index section of a MAR archive file contains several fixed-length fields
and also variable-length names for each file in the archive, terminated by a
null byte. Since that makes the length of the index variable, the length of the
entire index is also provided in the file.
When libmar opens a file, it allocates a buffer with the length given in the
file and reads the index from the file into that buffer.
mar_consume_index() then parses the entire index from that copy,
trying to make sure it doesn't read past the buffer it was given.

The length of the buffer is given to mar_consume_index()
by providing it a pointer to one byte past the end of the buffer.
However, mar_consume_index() treats this pointer as pointing *to* the end.
Therefore, it is possible for a malformed MAR file (one where the stated length
is less than the real length) to trigger a read of one byte beyond the
allocated memory.

Fix this by failing the parse when we reach the buffer end pointer minus one,
instead of when we reach that address itself.
2015-10-06 09:11:43 -07:00
Carsten "Tomcat" Book
d7f143eaad Backed out 2 changesets (bug 1202902) to recking bug 1202902 to be able to reopen inbound on a CLOSED TREE
Backed out changeset 647025383676 (bug 1202902)
Backed out changeset d70c7fe532c6 (bug 1202902)
2015-10-07 14:03:21 +02:00
Carsten "Tomcat" Book
b9e5717f50 Backed out 1 changesets (bug 1202902) for causing merge conflicts to mozilla-central
Backed out changeset cfc1820361f5 (bug 1202902)
2015-10-07 12:13:45 +02:00
Shu-yu Guo
b5f316de44 Bug 1202902 - Scripted fix the world. 2015-10-06 14:00:31 -07:00
Chris Peterson
dd2fcb9b7d Bug 1207030 - Enable -Wshadow flag in more directories that have no -Wshadow warnings. r=glandium 2015-09-22 21:39:03 -07:00
Nicholas Nethercote
21934537ce Bug 1202971 (part 1) - Fix compile warnings in libmar. r=rstrong.
Also remove ALLOW_COMPILER_WARNINGS=True so they don't come back.
2015-09-15 17:39:11 -07:00
Shu-yu Guo
45211869c8 Bug 1202902 - Mass replace toplevel 'let' with 'var' in preparation for global lexical scope. (rs=jorendorff) 2015-09-15 11:19:45 -07:00
Ted Mielczarek
9d4dac1765 bug 1200360 - fix $(DEFINES) usage in modules/libmar/tool/moz.build. r=mshal 2015-09-08 13:58:53 -04:00
Ted Mielczarek
326ab27018 bug 1198226 - Move HOST_{C,CXX}FLAGS to moz.build HOST_{CFLAGS,CXXFLAGS,DEFINES}. r=mshal
As part of this move, HOST_NSPR_MDCPUCFG needed to be changed to get the quoting right.
2015-09-08 11:35:43 -04:00
Nicholas Nethercote
69d088e45f Bug 1198334 (part 1) - Replace the opt-in FAIL_ON_WARNINGS with the opt-out ALLOW_COMPILER_WARNINGS. r=glandium.
The patch removes 455 occurrences of FAIL_ON_WARNINGS from moz.build files, and
adds 78 instances of ALLOW_COMPILER_WARNINGS. About half of those 78 are in
code we control and which should be removable with a little effort.
2015-08-27 20:44:53 -07:00
Stephen Pohl
ba6a095ff7 Bug 1184500: Improve handling of index names in MAR files. r=rstrong 2015-07-18 18:42:15 -07:00
Chris Peterson
1371c986b9 Bug 1171358 - Fix -Wunreachable-code-return warning in libmar/tool. r=rstrong 2015-06-04 00:00:23 -07:00
Josios
b4e7702c38 Bug 1161686 - libmar's |SECU_GetModulePassword| can leak allocated string (command line build utility). Free unused return of GetPasswordString. r=bbondy 2015-05-12 19:40:06 -07:00
Chris Peterson
7fc619a40b Bug 1163364 - Fix -Wnull-conversion warnings about conversion of NULL constant to 'CSSM_CSP_HANDLE'. r=spohl 2015-05-06 08:59:14 -07:00
Josios
e97515ddca Bug 1161666 - |extract_signature| leaks memory if |sigIndex| > 0 (command line build utility). Free allocated memory while skipping signatures. r=rstrong 2015-05-07 10:34:51 -07:00
Josios
db7fd147f8 Bug 1161640 - |mar_read_entire_file| can leak file descriptor (command line build utility). Close descriptor when fseeko fails. r=rstrong 2015-05-07 10:34:38 -07:00
Brian R. Bondy
58822691e2 Bug 973933 - Fix libmar warnings. r=rstrong. a=Callek 2015-04-06 12:03:19 -04:00
Stephen Pohl
42b12cf6ef Bug 991993: Disable NSS for updater on OSX and enable native APIs. r=smichaud,rstrong 2014-10-22 21:52:54 -04:00
Brian R. Bondy
3713db34af Bug 903135 - Multi platform MAR verification build config. r=rstrong 2014-10-22 21:00:19 -04:00
Brian Smith
08931193eb Bug 903135 - Updates to libmar needed to support B2G MAR signature verification. r=bbondy 2014-10-22 21:00:15 -04:00
Mike Hommey
21ec48314e Bug 1077148 part 4 - Add and use new moz.build templates for Gecko programs and libraries. r=gps
There are, sadly, many combinations of linkage in use throughout the tree.
The main differentiator, though, is between program/libraries related to
Gecko or not. Kind of. Some need mozglue, some don't. Some need dependent
linkage, some standalone.

Anyways, these new templates remove the need to manually define the
right dependencies against xpcomglue, nspr, mozalloc and mozglue
in most cases.

Places that build programs and were resetting MOZ_GLUE_PROGRAM_LDFLAGS
or that build libraries and were resetting MOZ_GLUE_LDFLAGS can now
just not use those Gecko-specific templates.
2014-10-30 13:06:12 +09:00
Andrew Halberstadt
6fe6152e95 Bug 1066735 - Remove root b2g and android specific xpcshell manifests, r=chmanchester 2014-10-07 18:18:28 -04:00
Nathan Froyd
ffb2ede83c Bug 1062874 - part 2 - don't preprocess head_libmar.js; r=ted 2014-09-02 13:46:10 -04:00
Nathan Froyd
2f0158c52c Bug 1062874 - part 1 - remove preprocessor-requiring bits from head_libmar.js.in; r=bbondy 2014-09-02 13:18:39 -04:00
Mike Hommey
8fd95ad480 Bug 1041941 - Use templates for programs, simple programs, libraries and C++ unit tests. r=gps 2014-09-03 14:10:54 +09:00
Shashank Sabniveesu
816e2777b5 Bug 1021142 - 'fclose()' at 2 places to avoid leaks on failure. r=bbondy 2014-08-28 11:35:50 -07:00
Mike Hommey
cbe32e4bb3 Bug 1047267 - Move remaining OS_LIBS and EXTRA_LIBS to moz.build. r=gps
* * *
Bug 1047267 - To fold with "Move remaining OS_LIBS and EXTRA_LIBS to moz.build"
2014-08-07 14:21:03 +09:00
Mike Hommey
3e3afccd68 Bug 1045783 - Move HOST_EXTRA_LIBS to moz.build as HOST_OS_LIBS. r=mshal 2014-08-06 07:26:05 +09:00
Mike Hommey
1cb5547cd1 Bug 1045783 - Move most OS_LIBS to moz.build and do some related cleanup. r=mshal 2014-08-06 07:25:33 +09:00
Mike Hommey
2a08f131e0 Bug 1043344 - Move libraries and programs build to the compile tier. r=gps 2014-07-25 07:14:40 +09:00
Mike Hommey
98ab786c13 Bug 1043289 - Don't declare SOURCES and USE_LIBS when there is nothing to build. r=mshal 2014-07-25 07:10:15 +09:00
Mike Hommey
171507509c Bug 1036894 part 9 - Replace all EXTRA_DSO_LDOPTS, SHARED_LIBRARY_LIBS and LIBS with EXTRA_LIBS, OS_LIBS or OS_LDFLAGS, appropriately. r=gps
OS_LIBS for libraries that are not part of the gecko tree, EXTRA_LIBS for
libraries, such as NSPR, that are in the tree, but are not handled by
moz.build just yet. Those EXTRA_LIBS may also come from a system library.
However, in cases where the expanded variables are always empty for the
in-tree case, OS_LIBS is used (as for, e.g. MOZ_ZLIB_LIBS). OS_LDFLAGS is
used exclusively for non-library linker flags.

Always pass EXTRA_LIBS before OS_LIBS on linker command lines.

Forbid EXTRA_DSO_LDOPTS, SHARED_LIBRARY_LIBS and LIBS in Makefiles.
2014-07-23 13:31:02 +09:00
Mike Hommey
5659a611dd Bug 1036894 part 8 - Move most in-tree library linkage information to moz.build, as USE_LIBS. r=gps 2014-07-23 13:30:52 +09:00
Mike Hommey
5c09d7ae19 Bug 1036894 part 7 - Move HOST_LIBS to moz.build, as HOST_USE_LIBS. r=gps 2014-07-23 13:29:50 +09:00
Stephen Pohl
0f4466b935 Bug 978597: Implement native MAR verification for OS X 10.6. r=smichaud 2014-04-22 20:45:59 -04:00
Brian R. Bondy
dad243b713 Bug 996564 - Mar command line help is wrong and fix libmar warning. r=spohl 2014-04-15 21:12:05 -04:00
Chris Peterson
fb837056e2 Bug 995655 - Fix -Wpointer-sign warnings in libmar. r=rstrong 2013-12-16 16:55:53 -08:00
Chris Peterson
562f0c8648 Bug 995655 - Fix -Wuninitialized warnings in libmar. r=rstrong 2014-04-12 11:47:57 -07:00
Stephen Pohl
454e0a3050 Bug 978596: Implement native MAR verification for OS X 10.7+. r=bbondy, rstrong, smichaud 2014-04-08 10:06:56 -04:00
Ehsan Akhgari
fbbc481860 Bug 975729 - Move one CFLAGS variable in libmar signing code to DEFINES in moz.build; r=mshal 2014-02-22 21:40:15 -05:00
Ehsan Akhgari
0ec6497e74 Bug 973405 - Move some misc LOCAL_INCLUDES to moz.build; r=glandium 2014-02-18 08:49:12 -05:00
Ms2ger
aa9d7b52b4 Bug 968856 - Move unconditional LOCAL_INCLUDES into moz.build; r=mshal 2014-02-15 21:24:59 +01:00
Ehsan Akhgari
6ed9144ae7 Bug 970745 - Move USE_STATIC_LIBS to moz.build; r=glandium 2014-02-11 09:12:33 -05:00
Ehsan Akhgari
82ebdc883f Bug 969757 - Remove the dead code in our tree which pretends to support OS/2; r=roc,mcmanus,gps,jorendorf,bsmedberg sr=bsmedberg 2014-02-10 17:57:01 -05:00
Ehsan Akhgari
acc6abdaa6 Bug 947735 - Build modules/libmar/ in unified mode; r=bbondy 2013-12-09 13:30:27 -05:00
Mike Hommey
fdd3247a81 Bug 874266 - Move all DEFINES that can be moved to moz.build. r=mshal 2013-11-27 22:55:07 +09:00
Mike Hommey
2f727b6d62 Backout changeset 3fd4b546eed4 (bug 874266) and changeset a35d2e3a872f (bug 942043) for ASAN build bustage and Windows test bustage
--HG--
extra : amend_source : f20d09aeff1c8b5cbd0f1d24c7ce04e86f3aed1d
2013-11-28 14:24:05 +09:00
Mike Hommey
b038245b8d Bug 874266 - Move all DEFINES that can be moved to moz.build. r=mshal 2013-11-28 13:08:16 +09:00
Mike Hommey
f0d1cd1e10 Bug 939044 - Remove most definitions of MODULE. r=mshal 2013-11-19 11:47:39 +09:00