OSDN Git Service
(root)
/
android-x86
/
system-extras.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "simpleperf: fix cmd_debug_unwind tests."
[android-x86/system-extras.git]
/
libpagemap
/
pm_memusage.c
diff --git
a/libpagemap/pm_memusage.c
b/libpagemap/pm_memusage.c
index
70cfede
..
71a5783
100644
(file)
--- a/
libpagemap/pm_memusage.c
+++ b/
libpagemap/pm_memusage.c
@@
-89,15
+89,15
@@
void pm_memusage_pswap_add_offset(pm_memusage_t *mu, unsigned int offset) {
if (mu->p_swap == NULL)
return;
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;
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 {
} 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));
}
soff = malloc(sizeof(pm_swap_offset_t));