stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8286705: GCC 12 reports use-after-free potential bugs

Browse Source 
Reviewed-by: kbarrett
This commit is contained in:
Yasumasa Suenaga 2022-05-15 01:32:40 +00:00
parent 63bd3b7728
commit 0e4bece5b5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.base/share/native/libjli/parse_manifest.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2022, 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
@ -288,8 +288,8 @@ find_positions(int fd, Byte *eb, jlong* base_offset, jlong* censtart)
for (cp = &buffer[bytes - ENDHDR]; cp >= &buffer[0]; cp--) for (cp = &buffer[bytes - ENDHDR]; cp >= &buffer[0]; cp--)
if (ENDSIG_AT(cp) && (cp + ENDHDR + ENDCOM(cp) == endpos)) { if (ENDSIG_AT(cp) && (cp + ENDHDR + ENDCOM(cp) == endpos)) {
(void) memcpy(eb, cp, ENDHDR); (void) memcpy(eb, cp, ENDHDR);
free(buffer);
pos = flen - (endpos - cp); pos = flen - (endpos - cp);
free(buffer);
return find_positions64(fd, eb, pos, base_offset, censtart); return find_positions64(fd, eb, pos, base_offset, censtart);
} }
free(buffer); free(buffer);

7
src/jdk.jpackage/linux/native/applauncher/LinuxPackage.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2021, 2022, 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
@ -25,6 +25,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <linux/limits.h> #include <linux/limits.h>
@ -123,6 +124,7 @@ static int popenCommand(const char* cmdlineFormat, const char* arg,
int callbackMode = POPEN_CALLBACK_USE; int callbackMode = POPEN_CALLBACK_USE;
int exitCode = -1; int exitCode = -1;
int c; int c;
ptrdiff_t char_offset;
cmdline = malloc(cmdlineLenth + 1 /* \0 */); cmdline = malloc(cmdlineLenth + 1 /* \0 */);
if (!cmdline) { if (!cmdline) {
@ -171,13 +173,14 @@ static int popenCommand(const char* cmdlineFormat, const char* arg,
if (strBufNextChar == strBufEnd) { if (strBufNextChar == strBufEnd) {
/* Double buffer size */ /* Double buffer size */
strBufCapacity = strBufCapacity * 2 + 1; strBufCapacity = strBufCapacity * 2 + 1;
char_offset = strBufNextChar - strBufBegin;
strNewBufBegin = realloc(strBufBegin, strBufCapacity); strNewBufBegin = realloc(strBufBegin, strBufCapacity);
if (!strNewBufBegin) { if (!strNewBufBegin) {
JP_LOG_ERRNO; JP_LOG_ERRNO;
goto cleanup; goto cleanup;
} }
strBufNextChar = strNewBufBegin + (strBufNextChar - strBufBegin); strBufNextChar = strNewBufBegin + char_offset;
strBufEnd = strNewBufBegin + strBufCapacity; strBufEnd = strNewBufBegin + strBufCapacity;
strBufBegin = strNewBufBegin; strBufBegin = strNewBufBegin;
} }