Mercurial > hg > icedtea8-forest > hotspot
changeset 10872:22f755afb22b
8219562: Line of code in osContainer_linux.cpp L102 appears unreachable
Reviewed-by: rriggs, sgehwolf
author | bobv |
---|---|
date | Tue, 19 Mar 2019 12:00:54 -0400 |
parents | 516928837b4a |
children | 812256bab2b6 |
files | src/os/linux/vm/osContainer_linux.cpp |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/linux/vm/osContainer_linux.cpp Wed May 28 14:42:00 2014 +0400 +++ b/src/os/linux/vm/osContainer_linux.cpp Tue Mar 19 12:00:54 2019 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -84,14 +84,14 @@ buf[MAXPATHLEN-1] = '\0'; _path = os::strdup(buf); } else { - char *p = strstr(_root, cgroup_path); + char *p = strstr(cgroup_path, _root); if (p != NULL && p == _root) { if (strlen(cgroup_path) > strlen(_root)) { int buflen; strncpy(buf, _mount_point, MAXPATHLEN); buf[MAXPATHLEN-1] = '\0'; buflen = strlen(buf); - if ((buflen + strlen(cgroup_path)) > (MAXPATHLEN-1)) { + if ((buflen + strlen(cgroup_path) - strlen(_root)) > (MAXPATHLEN-1)) { return; } strncat(buf, cgroup_path + strlen(_root), MAXPATHLEN-buflen);