commit 96c347a9b99d0c5a22d76a5661489a4b7623d183
author gitbuildkicker <android-build@google.com> Thu Aug 11 01:07:02 2016 -0700
committer gitbuildkicker <android-build@google.com> Thu Aug 11 01:07:02 2016 -0700
tree fe1bfde7f46b5dd61ae88dd5e72697fb4700214b
parent 96eaef2510c31e1b778f447f5fe3d988cabe27ff
parent 83abbaa3b5c82e6550e0c4aba04d9b2fc5f90ccc

merge in nyc-mr1-release history after reset to nyc-mr1-dev

libpagemap/pm_memusage.c

diff --git a/libpagemap/pm_memusage.c b/libpagemap/pm_memusage.c
index 70cfede..71a5783 100644
--- a/libpagemap/pm_memusage.c
+++ b/libpagemap/pm_memusage.c
@@ -89,15 +89,15 @@
     if (mu->p_swap == NULL)
         return;
 
-    if (offset > mu->p_swap->array_size) {
+    if (offset >= mu->p_swap->array_size) {
         fprintf(stderr, "SWAP offset %d is out of swap bounds.\n", offset);
         return;
+    }
+
+    if (mu->p_swap->offset_array[offset] == USHRT_MAX) {
+        fprintf(stderr, "SWAP offset %d ref. count if overflowing ushort type.\n", offset);
     } else {
-        if (mu->p_swap->offset_array[offset] == USHRT_MAX) {
-            fprintf(stderr, "SWAP offset %d ref. count if overflowing ushort type.\n", offset);
-        } else {
-            mu->p_swap->offset_array[offset]++;
-        }
+        mu->p_swap->offset_array[offset]++;
     }
 
     soff = malloc(sizeof(pm_swap_offset_t));