Skip to content

Commit

Permalink
Also fix integer underflow. *You saw nothing*
Browse files Browse the repository at this point in the history
  • Loading branch information
@G33kDude
G33kDude committed Aug 5, 2021
1 parent 3b09096 commit b618dd7
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
48 changes: 24 additions & 24 deletions Dist/cJson.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ class cJson
_LoadLib() {
static CodeBase64 := ""
. "TLUCAAwAVUiJ5UiDAOxwSIlNEEiJAFUYTIlFIEyJAE0oSItFEEiLAQAIRThIiwBIORDCD4S0ALjHRfwBAWrrR0iDfRgAAHQti0X8SJhIAI0VNRoA"
. "AEQPFLYEAWAYAWCNSAIASItVGEiJCmYAQQ++0GaJEOsCDwA2IIsAjVABgQEIiRCDRfwBBT8Q9RkAAAE+hMB1EqUDek0gAT9JicgASInB6AYfAACF"
. "AEQPFLYEAWAYAWCNSAIASItVGEiJCmYAQQ++0GaJEOsCDwA2IIsAjVABgQEIiRCDRfwBBT8Q9RkAAAE+hMB1EqUDek0gAT9JicgASInB6CYfAACF"
. "A3EZEGDHACIADl0CuAGn6S4GAADGSEX7AANTUDADB0ASIABodVsADAHHRQr0Amg1hBAYi0X0AYBIweAFSAHQSJiJRdCAC4ABUBCACxiDwAEADQCF"
. "lMCIAEX7g0X0AYB90PsAdBMBGWMBFAUtFHyyA1Ysgg8IQbjCWwExBkG4e4ADEGBERImPX8dF8IJgDhYFAhmETfCJTciDfdDwAH5eGYwsDyyZCxIg"
. "jwsPtoA68AGEgMAPhNgBAACBIOXGOjABQ42BATUrZ0ABpsjAD415Hx1FEhxUEszp9kNQCRPp4sAEyiWqOMIlsMKr7Myr7MKbtJYX8avswKvDD1bA"
. "D1PIqxEzUhyeRSxMGOvaG9QSJgZG0xI6vnkBDwAPtkAYPAF1HyeDEMAsahCCG6BRfALDwi9DBQYPhZRAQsUFADlFKHVpx0XoZQwu6AImLhYfLg8u"
. "jwsPtoA68AGEgMAPhNgBAACBIOXGOjABQ42BATUrZ0ABpsjAD415Px1FEhxUEszp9kNQCRPp4sAEyiWqOMIlsMKr7Myr7MKbtJYX8avswKvDD1bA"
. "D1PIqxEzchyeRSxMGOvaG9QSRgZG0xI6vnkBDwAPtkAYPAF1HyeDEMAsahCiG6BRfALDwi9DBQYPhZRAQsUFADlFKHVpx0XoZQwu6AImLhYfLg8u"
. "6JMALuMH7hUHLun2qg6qMKEO5KwO5KIGvaAGW78OrQ7koA7jB32pDoBVqg44oQ7grA7gogZNW78OsA7goA7jBw2pDgrBpw5Mi00oTKAFYgmAi004"
. "SIlMJAC1FE0wAQEgYTQu+v9Y/+nYQ2RjNAXVOdOpILbprUJk3KwY3KIQbIwUvxivGNygGOMHTHfgB0tkTRAwgL4fhwwM8McADEh9wa0PjNvgHkyu"
. "SIlMJAC1FE0wAQEgYTQu+v9Y/+nYQ2RjNAXVOfOpILbprUJk3KwY3KIQbIwUvxivGNygGOMHTHfgB0tkTRBQgL4fhwwM8McADEh9wa0PjNvgHkyu"
. "Gl1Ern1frkrGSIPEMHBdw5AFAO/lgexCMEEyjawkgMEFiaSNwMIAlcgCDYXBAIVgFxRlAUjHQAjiK+0gEIVCBQERUAARowFBbwHlAg+3AGaD+CBE"
. "dNVNAgp0wk0CDUR0r00CCXScTQJ7MA+FKQPiElMPx0WiUEIPx0VYdABgcgBwiwUD/yAVMSdBcwWE9f7QAMdEJEBTAkhEJDiCAI1VsCdUVCQwgABQ"
. "gQAokAEgUdARAEG58QFBEhW6QaICicFB/9LihIn8RWjPEM8QzxDPEM8QzxBhJwF9D4TC0jRpAYUFgG2sXgGD+CJ0CsK4IBD/6RYRgQ7AJgaJYAfC"
. "Huj3/f//kIXAdCIDAvUQDxa/7wzvDO8M7wzvDCcBOhUK3nQPCAkIUijHCzrDC7QDljiyA/FEjQMsRWjUOf6ykAF/Go8Njw2PDY8Njw0xJwEsdR1v"
. "B2MH6cLN0AuQjh3VDGoPnxCcEAWwOQm2OYtVaEiJNFAIs6ItygOTBVsPfIVlIm8/BfQzUppwAPindABSQhAzw/v5M7XRANn/M41VcJzzM/D/M/8z"
. "heAZ2PAzcMeFrDAB/4ECHxofGh8aHxofGh8aJwHYXQ+EYbOfNN5HUCgnZsfgWScnxQ0xAuImi9aVcQxQDXBEJ30wGC8Nvy8NLw0vDS8NLw1JJyRv"
. "heAZ2PAzcMeFrDAB/4ECHxofGh8aHxofGh8aJwHYXQ+EYbOfNN5HUCgnZsfgWScnxQ0xAuImi9aVcQxQDXBEJ50wGC8Nvy8NLw0vDS8NLw1JJyRv"
. "B2VjB4PTFumqQFC+J135ZQ3uDH8ivye5J0DXtSfGscoDFEgPhRPCvz8FIcsQSImFoHgXi5UH0gCwBWcHCADpWQQVDxt1tAsy7wf4XA+chfavY+8H"
. "1Qp1NCABe5IHcQKJQghCfB8EtDzHb+oFVAdvBGIEXG8EZQSA2W8E+C9vBGIEL28EZQTyOW8E+GJvBOQUbwRkBLby6kJjBGZvBGIEDG8EZWUEq28E"
. "+G5vBGIECgtvBGUEZG0E7LYAZoP4cnU0SIsAhaAAAABIjVAQAkiJlQFQZscA1A0AALDAAViLA2QENGCJEOkdAgFUBXAPVLcAAIx0FIwJF4zWwgEP"
. "+G5vBGIECgtvBGUEZG0E77YAZoP4cnU0SIsAhaAAAABIjVAQAkiJlQFQZscA1A0AALDAAViLA2QENGCJEOkdAgFUBXAPVLcAAIx0FIwJF4zWwgEP"
. "jHUPhYUKFgszgwRiAFcAAMeFnAAFOQEA6TsDMgEaAEbB4DgEicIFKQIzCmIvfuJCDRI5fy8HH4IdBw8gAdCD6DCJJ+muI4INiyBAfj8NCUZ/Siwa"
. "KjcJKutcDR9gFY8oZpwoV4ooCrj/UQAA6WUIF6eDAqEBBIO9gQEDD464/hD//0iDQhAC6zqFww8lyQ8QSI1Kxw+qCEZ8SEB8jQMmEpBcICIPhZD7"
. "gBaLhYrIggVIRg4pyEgCLYHDBUAISIPoBIt5JdUuuEJ+hwfPYi10Qi7OfA+ODAVPCjnQD4/1BEGSmIFBAxuLQSIAHhTFAkjHQEBAeVAZdSLDDUFJ"
Expand All @@ -50,31 +50,31 @@ class cJson
. "5Qt4W+ALgwS1hATgC6PsC1Urp3DkC0PqCzXqC+sFIVIHSIHEMGAPXcM+kAcApCQPAA8AAgAiVQBua25vd25fTwBiamVjdF8AIgGFAHRydWUAZmEA"
. "bHNlAG51bGwBlwJWYWx1ZV8AADAxMjM0NTY3ADg5QUJDREVGAfMEVUiJ5UiDxACASIlNEEiJVQAYTIlFIMdF/A0DTkXATBFWKEiNTQAYSI1V/EiJ"
. "VEAkKMdEJCDxAUFCuYFESYnIutMCTYAQ/9BIx0Xg0gAox0XodADwtAQgSDiJReDgAFOEogVMi0BQMItF/EgQBUBR0wJEJDiFADCCAI38VeBGB4CI"
. "QAeiB2IVcZFgTRBB/9LRBTMhCfx1HqIGgZLCGGAG5ADRGMTrSacCA3U8tQEBDKCASDnQfHBNRYEOTNhJAILjBejKwAGFCMB0D6AB2EiLVQUAA1LA"
. "BBCQSIPsyIBdw/MT7GDxE+QTQGbHReoAAIAEiRRF+KAUFfADi00YgInKuM3MzMwwTADCSMHoIInCwQTqAyZXKcGJyokA0IPAMINt/AEEicIxEZhm"
. "iVRFCsBRBMKKA8HoA4kARRiDfRgAdal/kAoQArACUIyxjNAJiAshs7CqUArEYAkn9Apw/x6YAOmuQk+RGVAYYwWIweAFcQWJRdDxAAZjEAbRAUAw"
. "SDnC+A+NmpAcsA7AE2ABoAECQAAFRfDGRe8AgEiDffAAeQigAOABSPdd8LAgQRBACSDwSLpnZgMASImQyEj36oKY+AJAJIBJwfg/TCnAwQuhyZlI"
. "KcFIthHoshEe6LMRAJX/BPQESMH5Uj9gA0gpsQvw4gh1gICAfe8AdBBRBEEzBMdERZAtESaQA/IANBSJRcDGRedjUEVyLItF4KFAsa5FUeEBD7cQ"
. "JAEMIQEYSEgByINFdW+vAgDgZoXAdR55AfACdQE6BlAGARB/XwPQAXQiA18DcgEKg0XgAekCZsBEkIB95wAPJIT2xTWLVbALELhZ0TXpAVAAChs4"
. "ARuMQ5EsqBrIxkXfcA7Y9XMO2OYGyHUOIgF/Dq4C93UOdwF7Dt9yDl8Dcw5fA4VzDth2Dt8AdBI9DmDrIINF/IAcSA4gYUIOO/3//9JBkC9wRfY5"
. "MPkuxkX/cA/46UMCfRCSKv+RKlAEUAIBKiVMsgD36kiJ0EjB+AACSYnIScH4P0BMKcBIicICmOAAAkgB0EgBwEgAKcFIicqJ0I0ASDCLRfiNUAEA"
. "iVX4icpImGYAiVRF0EiLTRAQSLpnZgMASInIQkgGokjB+T8AcEgAKdBIiUUQSIMAfRAAD4V6//+A/4B9/wB0EgaWAQBJx0RF0C0AgyBt+AHrPAAo"
. "GAAAdCJIi0UYSIsAAEiNSAJIi1UgGEiJCosAKmPSAA+3VFXQZokQxOsPACEgiwAAQwEIBIkQAT2DffgAeQi+uAAAAEiDxDAAXcOQVUiJ5Uggg+wg"
. "SIkAp4lVoBhMiUUgA2EcD2EAZscAIgDpCAQjgB6LLen0A4IJEA8AtwBmg/gidWZlgyEZkiFcAA5OHDmQKwMvCjl8CjlcSjlcANTpHRA5CYocCL8c"
. "iAugYgDpqgKPHJbDBA2EHAy/HIgLZgDpNzWQHCOKHAq/HIgLbgBo6cQBjxywwwSEHA1DvxyIC3IA6VGQHD0NihwJvxzIBXQA6d4bQWxMDspjAkQO"
. "H34NcYcBfn58/w/wD9MFdaPQBUMND7fAIJIgQQUhAJqJweiMYBLrNF2DCR6PCcAAwAYS8YlIGINFEMAEIxiFwA+ghfz7//+5EiKvEvqQoJAgoJAH"
. "AOWRAKWkkUJmgaONBT31oAuJIEXwx0X8wZfrMoAPt0UQg+APobEIi0XwQLEPtgBmQA++0ItF/GOv6CEhBGbB6AQhCINFAvygn/wDfsjHRaL4wHgA"
. "6z9jFSXgrABImEQPt0RF6NHPFkSJwnqpu2WppRg="
. "QAeiB2IVcZFgTRBB/9LRBTMhCfx1HqIGgZLCGGAG5ADRGMTrYKcCA3VTtQEBDGCASDnQfUBp1AK6RfAaf0IbOdB/4E5FmfEP2Elwg1MH6NMwAxCF"
. "wHQPoAHYSIsKVVADUjAGEJBIg8zsgBge8xXsYPEV5BVAZsdF6gAAEAWJFEX4oBYVgASLTRiAicq4zczMzDBOAMJIweggicLBBOoDJlkpwYnKiQDQ"
. "g8Awg238AQSJwjETmGaJVEUKwFEEwooDwegDiQBFGIN9GAB1qX8gCxACsAJQjrGOYAoYDAGzsKzgCsRgCSn0CnD/IJgA6a5CUZEbUBhjBYjB4AVx"
. "BYlF0PEABmMQBtEBQDBIOcL4D42akB6wDsAVYAGgAQJAAAVF8MZF7wCASIN98AB5CKAA4AFI913wsCJBEEAJIPBIumdmAwBIiZDISPfqgpr4AkAm"
. "gEnB+D9MKcDBC6HJm0gpwUi2EeiyER7osxEAl/8E9ARIwflSP2ADSCmxC/DiCHWAgIB97wB0EFEEQTMEx0RFkC0RKJAD8gA0FIlFwMZF52NQR3Iu"
. "i0XgoUKxsEVR4QEPtxAkAQwhARhISAHIg0d1b68CAOBmhcB1HnkB8AJ1AToGUAYBEIFfA9ABdCIDXwNyAQqDReAB6QJmcCuQgH3nAA8khPbFN4tV"
. "sAsQuFnRN+kBUAAKGzgBG4yGyrMCpRrIxkXfcA7q2HMO2OYGyHUOIgF/Du+uAnUOdwF7Dt9yDl8Dcw4LXwNzDth2Dt8AdBLBPQ7rIINF/IAcSA7C"
. "IEIOO/3//9JDkC8ocF3D9C4w+S7GRQr/cA/4QgJcsgCDfRAAeQjGRQD/AUj3XRBIi0BNEEi6Z2YDAEgAichI9+pIidAASMH4AkmJyEkAwfg/TCnA"
. "SIkCwgJM4AJIAdBIAAHASCnBSInKAInQjUgwi0X4AI1QAYlV+InKgEiYZolURdAYohBIwfk/AHBIKdAgSIlFEEgBiQ+FAHr///+Aff8ADHQSBksA"
. "ScdERdAALQCDbfgB6zwBACgYAHQiSItFABhIiwBIjUgCAEiLVRhIiQqLAQAqY9IPt1RV0CBmiRDrDwAhIIsmAABDAQiJEAE9g31A+AB5vrgAAABI"
. "AIPEMF3DkFVIAInlSIPsIEiJAYBTiVUYTIlFIAWDMByPMGbHACIAGOkIBIAeiy3p9AMBggkQD7cAZoP4KCJ1ZoMhGZIhXABbDk4cOZADLwo5fAo5"
. "XKFKOVwA6R2QHAmKHAYIvxyIC2IA6aoCbY8clsMEhBwMvxyIC2aoAOk3kBwjihwKvxxBiAtuAOnEAY8csBvDBIQcDb8ciAtyAOnqUZAcPYocCV8O"
. "Xw7GBbB0AOneQWxMDspjAhFEDh9+DYcBfn58N/8P8A/TBXXQBUMND7cawCCSIEEFAJqJwejSjGAS6zSDCR6PCcAAhcAGEvGJSINFEMAEASMYhcAP"
. "hfz7/6r/uRIirxKQoJAgoJAvBwDlkQClpJFmgaONBQQd9aALiUXwx0UC/MGX6zIPt0UQiIPgD6Gxi0XwQLEAD7YAZg++0IsURfxjr+ghBGbB6CIE"
. "IQiDRfygn/wDIH7Ix0X4wHgA6wo/YxUl4KxImEQPELdERejPFkSJwg16qbtlqaUY"
static Code := false if ((A_PtrSize * 8) != 64) {
Throw Exception("_LoadLib does not support " (A_PtrSize * 8) " bit AHK, please run using 64 bit AHK")
} ; MCL standalone loader https://github.com/G33kDude/MCLib.ahk
; Copyright (c) 2021 G33kDude, CloakerSmoker (CC-BY-4.0)
; https://creativecommons.org/licenses/by/4.0/ if (!Code) {
if !DllCall("Crypt32\CryptStringToBinary", "Str", CodeBase64, "UInt", 0, "UInt", 1, "UPtr", 0, "UInt*", CompressedSize, "Ptr", 0, "Ptr", 0, "UInt")
throw Exception("Failed to parse MCLib b64 to binary") CompressedSize := VarSetCapacity(DecompressionBuffer, CompressedSize, 0) if !DllCall("Crypt32\CryptStringToBinary", "Str", CodeBase64, "UInt", 0, "UInt", 1, "Ptr", &DecompressionBuffer, "UInt*", CompressedSize, "Ptr", 0, "Ptr", 0, "UInt")
throw Exception("Failed to convert MCLib b64 to binary") if !(pCode := DllCall("GlobalAlloc", "UInt", 0, "Ptr", 9776, "Ptr"))
throw Exception("Failed to reserve MCLib memory") if (DllCall("ntdll\RtlDecompressBuffer", "UShort", 0x102, "Ptr", pCode, "UInt", 9776, "Ptr", &DecompressionBuffer, "UInt", CompressedSize, "UInt*", DecompressedSize, "UInt"))
throw Exception("Error calling RtlDecompressBuffer",, Format("0x{:08x}", r)) if !DllCall("VirtualProtect", "Ptr", pCode, "Ptr", 9776, "UInt", 0x40, "UInt*", OldProtect, "UInt")
throw Exception("Failed to convert MCLib b64 to binary") if !(pCode := DllCall("GlobalAlloc", "UInt", 0, "Ptr", 9808, "Ptr"))
throw Exception("Failed to reserve MCLib memory") if (DllCall("ntdll\RtlDecompressBuffer", "UShort", 0x102, "Ptr", pCode, "UInt", 9808, "Ptr", &DecompressionBuffer, "UInt", CompressedSize, "UInt*", DecompressedSize, "UInt"))
throw Exception("Error calling RtlDecompressBuffer",, Format("0x{:08x}", r)) if !DllCall("VirtualProtect", "Ptr", pCode, "Ptr", 9808, "UInt", 0x40, "UInt*", OldProtect, "UInt")
Throw Exception("Failed to mark MCLib memory as executable") Exports := {} for ExportName, ExportOffset in {"BIGINTS_AS_FLOATS": 0, "dumps": 16, "fnGetObj": 1840, "loads": 1856, "objFalse": 6752, "objNull": 6768, "objTrue": 6784} {
Exports[ExportName] := pCode + ExportOffset
} Code := Exports } return Code
Expand Down
2 changes: 1 addition & 1 deletion Src/loads.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void comobjset(IDispatch *pObj, BSTR key, VARIANT *value)
{
value->pdispVal->lpVtbl->Release(value->pdispVal);
}
else if (value->vt == VT_I4 && value->llVal > 2147483647) // Fix integer overflow
else if (value->vt == VT_I4 && (value->llVal > 2147483647 || value->llVal < -2147483648)) // Fix integer overflow
{
Field *field;
if (obj_get_field_str((Object *)pObj, key, &field))
Expand Down

0 comments on commit b618dd7

Please sign in to comment.