diff options
| author | Dong Jinguang <dongjinguang@huawei.com> | 2018-01-03 00:43:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-03 00:43:14 +0000 |
| commit | 3d484247a53a47a5ccaa2d5be65e99706b7512ef (patch) | |
| tree | 9c87c5344f3f145ab119d4279204af8bcd97589b | |
| parent | 6fd11f3bc94c5f4019e0d762f6381b105e6745b2 (diff) | |
| parent | 1dae5eab9740e233aa404d39507ffe6123794b84 (diff) | |
| download | android_external_e2fsprogs-3d484247a53a47a5ccaa2d5be65e99706b7512ef.tar.gz android_external_e2fsprogs-3d484247a53a47a5ccaa2d5be65e99706b7512ef.tar.bz2 android_external_e2fsprogs-3d484247a53a47a5ccaa2d5be65e99706b7512ef.zip | |
Merge "blkid: sanity check 'end' address must be greater than or equal to 'lable' address." am: 58e29f870e
am: 1dae5eab97
Change-Id: I522cb2bf2527854bb2a866b378f98875ad544f9c
| -rw-r--r-- | lib/blkid/probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index 3bcf4c3d..865d9aa3 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -41,7 +41,7 @@ static int figure_label_len(const unsigned char *label, int len) { const unsigned char *end = label + len - 1; - while ((*end == ' ' || *end == 0) && end >= label) + while (end >= label && (*end == ' ' || *end == 0)) --end; if (end >= label) return end - label + 1; |