expiring_lru_cached_adapter: handle index out of range for

lishuangquan · lishuangquan · commit 87c6c6e7072c · 2019-04-19T15:36:06.000+08:00
missed_values: bugfix

Change-Id: I52ec590459a152785e8ee436a10560c5819bc309
diff --git a/cache/expiring_lru_cached_adapter.h b/cache/expiring_lru_cached_adapter.h
@@ -131,11 +131,11 @@ class expiring_lru_cached_adapter {
         catch (...) {
             got_origin_value = false;
         }
-        for (size_t i = 0; i < missed_keys.size(); ++i) {
+        for (size_t i = 0, missed_values_size = missed_values.size(); i < missed_keys.size(); ++i) {
             size_t pos = missed_poses[i];
             size_t cache_id = cache_ids[pos];
             std::unique_lock<std::mutex> lk(__mtxes[cache_id]);
-            if (got_origin_value) {
+            if (got_origin_value && i < missed_values_size) {
                 values[pos] = missed_values[i];
                 __caches[cache_id].set(missed_keys[i], missed_values[i]);
             }

Original file line number	Diff line number	Diff line change
`@@ -131,11 +131,11 @@ class expiring_lru_cached_adapter {`
`131`	`131`	`catch (...) {`
`132`	`132`	`got_origin_value = false;`
`133`	`133`	`}`
`134`		`- for (size_t i = 0; i < missed_keys.size(); ++i) {`
	`134`	`+ for (size_t i = 0, missed_values_size = missed_values.size(); i < missed_keys.size(); ++i) {`
`135`	`135`	`size_t pos = missed_poses[i];`
`136`	`136`	`size_t cache_id = cache_ids[pos];`
`137`	`137`	`std::unique_lock<std::mutex> lk(__mtxes[cache_id]);`
`138`		`- if (got_origin_value) {`
	`138`	`+ if (got_origin_value && i < missed_values_size) {`
`139`	`139`	`values[pos] = missed_values[i];`
`140`	`140`	`__caches[cache_id].set(missed_keys[i], missed_values[i]);`
`141`	`141`	`}`