archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 01:54:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8219562: Line of code in osContainer_linux.cpp L102 appears unreachable

Browse source 
Reviewed-by: rriggs, sgehwolf
This commit is contained in:
Bob Vandette 2019-03-19 12:00:54 -04:00
parent b77b4b254c
commit e97e09288e
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/hotspot/os/linux/osContainer_linux.cpp
View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -99,14 +99,14 @@ class CgroupSubsystem: CHeapObj<mtInternal> {
buf[MAXPATHLEN-1] = '\0'; buf[MAXPATHLEN-1] = '\0';
_path = os::strdup(buf); _path = os::strdup(buf);
} else { } else {
char *p = strstr(_root, cgroup_path); char *p = strstr(cgroup_path, _root);
if (p != NULL && p == _root) { if (p != NULL && p == _root) {
if (strlen(cgroup_path) > strlen(_root)) { if (strlen(cgroup_path) > strlen(_root)) {
int buflen; int buflen;
strncpy(buf, _mount_point, MAXPATHLEN); strncpy(buf, _mount_point, MAXPATHLEN);
buf[MAXPATHLEN-1] = '\0'; buf[MAXPATHLEN-1] = '\0';
buflen = strlen(buf); buflen = strlen(buf);
if ((buflen + strlen(cgroup_path)) > (MAXPATHLEN-1)) { if ((buflen + strlen(cgroup_path) - strlen(_root)) > (MAXPATHLEN-1)) {
return; return;
} }
strncat(buf, cgroup_path + strlen(_root), MAXPATHLEN-buflen); strncat(buf, cgroup_path + strlen(_root), MAXPATHLEN-buflen);