mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-07 16:28:38 +09:00
import changes from tenfourfox:
- #622: update brotli to 1.0.9, woff2 to tip (7c24b77e7) - #622: actually add new brotli files (fc50954e6)
This commit is contained in:
parent
64ccce7c22
commit
1bdcd46977
64 changed files with 3990 additions and 2780 deletions
|
|
@ -13,4 +13,4 @@ from within the modules/woff2 directory.
|
|||
|
||||
Currently no patching is needed. (Let's keep it that way if we can!)
|
||||
|
||||
Current version: [commit 1bccf208bca986e53a647dfe4811322adb06ecf8].
|
||||
Current version: [commit 3831354113db8803fb1f5ba196cf0bbb537578dd].
|
||||
|
|
|
|||
|
|
@ -111,6 +111,16 @@ int WithSign(int flag, int baseval) {
|
|||
return (flag & 1) ? baseval : -baseval;
|
||||
}
|
||||
|
||||
bool _SafeIntAddition(int a, int b, int* result) {
|
||||
if (PREDICT_FALSE(
|
||||
((a > 0) && (b > std::numeric_limits<int>::max() - a)) ||
|
||||
((a < 0) && (b < std::numeric_limits<int>::min() - a)))) {
|
||||
return false;
|
||||
}
|
||||
*result = a + b;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool TripletDecode(const uint8_t* flags_in, const uint8_t* in, size_t in_size,
|
||||
unsigned int n_points, Point* result, size_t* in_bytes_consumed) {
|
||||
int x = 0;
|
||||
|
|
@ -166,9 +176,12 @@ bool TripletDecode(const uint8_t* flags_in, const uint8_t* in, size_t in_size,
|
|||
(in[triplet_index + 2] << 8) + in[triplet_index + 3]);
|
||||
}
|
||||
triplet_index += n_data_bytes;
|
||||
// Possible overflow but coordinate values are not security sensitive
|
||||
x += dx;
|
||||
y += dy;
|
||||
if (!_SafeIntAddition(x, dx, &x)) {
|
||||
return false;
|
||||
}
|
||||
if (!_SafeIntAddition(y, dy, &y)) {
|
||||
return false;
|
||||
}
|
||||
*result++ = {x, y, on_curve};
|
||||
}
|
||||
*in_bytes_consumed = triplet_index;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue