commit bdd7753e23addd869943b6cba1696aa39b5f8797
author Chung-yih Wang <cywang@chromium.org> Tue Mar 05 06:14:56 2013
committer ChromeBot <chrome-bot@google.com> Wed Mar 06 00:13:24 2013
tree 6bef291822cda7def2bc0fe97a2fe339c8e6eea4
parent 84acca780f9b780a08b108985f2d055adb24aa0b

fix incorrect pointer references

Incorrect pointer usage may crash system.

BUG=chromium-os:37272
TEST=make no difference
Change-Id: I999383f3505510db4762ff7a090bff348c898f80
Reviewed-on: https://gerrit.chromium.org/gerrit/44618
Reviewed-by: Andrew de los Reyes <adlr@chromium.org>
Commit-Queue: Chung-yih Wang <cywang@chromium.org>
Tested-by: Chung-yih Wang <cywang@chromium.org>

src/finger_merge_filter_interpreter.cc

diff --git a/src/finger_merge_filter_interpreter.cc b/src/finger_merge_filter_interpreter.cc
index 1d73ecb..aa5af66 100644
--- a/src/finger_merge_filter_interpreter.cc
+++ b/src/finger_merge_filter_interpreter.cc
@@ -86,15 +86,17 @@
   // Append GESTURES_FINGER_MERGE flag for close fingers and
   // fingers marked with the same flag previously
   for (short i = 0; i < hwstate.finger_cnt; i++) {
-    FingerState *fs = &hwstate.fingers[i];
+    FingerState *fs = hwstate.fingers;
 
     // If it's a new contact, add the initial info
-    if (!MapContainsKey(start_info_, fs->tracking_id)) {
-      Start start_info = { fs->position_x, fs->position_y, hwstate.timestamp };
-      start_info_[fs->tracking_id] = start_info;
+    if (!MapContainsKey(start_info_, fs[i].tracking_id)) {
+      Start start_info = { fs[i].position_x,
+                           fs[i].position_y,
+                           hwstate.timestamp };
+      start_info_[fs[i].tracking_id] = start_info;
     }
 
-    if (SetContainsValue(never_merge_ids_, fs->tracking_id))
+    if (SetContainsValue(never_merge_ids_, fs[i].tracking_id))
       continue;
     if (SetContainsValue(merge_tracking_ids_, fs[i].tracking_id))
       fs[i].flags |= GESTURES_FINGER_MERGE;