summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarry Cutts <hcutts@google.com>2023-12-04 17:22:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-04 17:22:24 +0000
commit210595d5e741407151c12097a1790b42a4801e35 (patch)
tree7a95df8cbbfe3417f2bf5f71725a195a57152c1a
parentccf59f17a4470e045063c9edff46a63c32b5a388 (diff)
parent728ebf8b496136141f6f281882c137cd94806632 (diff)
downloadlibchrome-gestures-210595d5e741407151c12097a1790b42a4801e35.tar.gz
Merge UBSan crash fix from upstream am: 972ec0c816 am: 728ebf8b49
Original change: https://android-review.googlesource.com/c/platform/external/libchrome-gestures/+/2855729 Change-Id: I1740ecd7f0e57527905c8544e0530cfc3a6938e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--METADATA.android4
-rw-r--r--src/immediate_interpreter.cc1
2 files changed, 3 insertions, 2 deletions
diff --git a/METADATA.android b/METADATA.android
index 63d4c44..9f26ca1 100644
--- a/METADATA.android
+++ b/METADATA.android
@@ -6,7 +6,7 @@ third_party {
type: GIT
value: "https://chromium.googlesource.com/chromiumos/platform/gestures/"
}
- version: "81c9ccb03ad4279d6e9dbc701ad970a2ed8b6ada"
- last_upgrade_date { year: 2023 month: 11 day: 28 }
+ version: "d2ec17e2817001e97841fbab6da708a4183da4e1"
+ last_upgrade_date { year: 2023 month: 12 day: 4 }
license_type: NOTICE
}
diff --git a/src/immediate_interpreter.cc b/src/immediate_interpreter.cc
index 2f793cb..00d8b16 100644
--- a/src/immediate_interpreter.cc
+++ b/src/immediate_interpreter.cc
@@ -1000,6 +1000,7 @@ ImmediateInterpreter::ImmediateInterpreter(PropRegistry* prop_reg,
last_movement_timestamp_(-1.0),
swipe_is_vertical_(false),
current_gesture_type_(kGestureTypeNull),
+ prev_gesture_type_(kGestureTypeNull),
state_buffer_(8),
scroll_buffer_(20),
pinch_guess_start_(-1.0),