Bug 1230910 Fix 'error: narrowing conversion of '2148073472u' from 'unsigned int' to 'int' inside { }' draft
authorTom Ritter <tom@mozilla.com>
Wed, 08 Mar 2017 22:22:28 +0000
changeset 496074 5287dbbf6068e95461b1aba72fb64162fe311373
parent 496073 249491dbdc3d6161ebb963ed6fa302499c407cca
child 496075 e625f8e7090222263dfb642cad6c98bad69fa9ae
push id48518
push userbmo:tom@mozilla.com
push dateThu, 09 Mar 2017 19:30:51 +0000
bugs1230910
milestone52.0.1
Bug 1230910 Fix 'error: narrowing conversion of '2148073472u' from 'unsigned int' to 'int' inside { }' MozReview-Commit-ID: IpS1qwG1LkM
security/sandbox/chromium/sandbox/win/src/restricted_token_utils.cc
security/sandbox/chromium/sandbox/win/src/sidestep/mini_disassembler_types.h
--- a/security/sandbox/chromium/sandbox/win/src/restricted_token_utils.cc
+++ b/security/sandbox/chromium/sandbox/win/src/restricted_token_utils.cc
@@ -53,17 +53,17 @@ DWORD CreateRestrictedToken(TokenLevel s
       deny_only_sids.push_back(WinBuiltinAdministratorsSid);
       deny_only_sids.push_back(WinAccountAdministratorSid);
       deny_only_sids.push_back(WinAccountDomainAdminsSid);
       deny_only_sids.push_back(WinAccountCertAdminsSid);
       deny_only_sids.push_back(WinAccountSchemaAdminsSid);
       deny_only_sids.push_back(WinAccountEnterpriseAdminsSid);
       deny_only_sids.push_back(WinAccountPolicyAdminsSid);
       deny_only_sids.push_back(WinBuiltinHyperVAdminsSid);
-      deny_only_sids.push_back(WinLocalAccountAndAdministratorSid);
+      //deny_only_sids.push_back(WinLocalAccountAndAdministratorSid);
       privilege_exceptions.push_back(SE_CHANGE_NOTIFY_NAME);
       break;
     }
     case USER_INTERACTIVE: {
       sid_exceptions.push_back(WinBuiltinUsersSid);
       sid_exceptions.push_back(WinWorldSid);
       sid_exceptions.push_back(WinInteractiveSid);
       sid_exceptions.push_back(WinAuthenticatedUserSid);
--- a/security/sandbox/chromium/sandbox/win/src/sidestep/mini_disassembler_types.h
+++ b/security/sandbox/chromium/sandbox/win/src/sidestep/mini_disassembler_types.h
@@ -122,19 +122,19 @@ struct SpecificOpcode {
   int table_index_;
 
   // The opcode type
   InstructionType type_;
 
   // Description of the type of the dest, src and aux operands,
   // put together from an enOperandType flag and an enAddressingMethod
   // flag.
-  int flag_dest_;
-  int flag_source_;
-  int flag_aux_;
+  unsigned int flag_dest_;
+  unsigned int flag_source_;
+  unsigned int flag_aux_;
 
   // We indicate the mnemonic for debugging purposes
   const char* mnemonic_;
 };
 
 // The information we keep in our tables about each of the different
 // valid instructions recognized by the IA-32 architecture.
 struct Opcode {
@@ -143,19 +143,19 @@ struct Opcode {
   int table_index_;
 
   // The opcode type
   InstructionType type_;
 
   // Description of the type of the dest, src and aux operands,
   // put together from an enOperandType flag and an enAddressingMethod
   // flag.
-  int flag_dest_;
-  int flag_source_;
-  int flag_aux_;
+  unsigned int flag_dest_;
+  unsigned int flag_source_;
+  unsigned int flag_aux_;
 
   // We indicate the mnemonic for debugging purposes
   const char* mnemonic_;
 
   // Alternative opcode info if certain prefixes are specified.
   // In most cases, all of these are zeroed-out.  Only used if
   // bPrefixDependent is true.
   bool is_prefix_dependent_;