Browse Source

Fix a race condition in CtClassType#getClassFile3

javassist fails to find a class when concurrently running process
compresses the class (converts classfile to raw bytes)

the idea of the fix is to make sure to only update rawClassfile and classfile
under lock in getClassFile3, all other places that modify classfile are
already synchronized

when reading the object state, we need to read under lock both classfile and
rawClassFile otherwise we might get an inconsistent state
tags/rel_3_28_0_ga
michalkurka 3 years ago
parent
commit
64e15350cf
1 changed files with 19 additions and 6 deletions
  1. 19
    6
      src/main/javassist/CtClassType.java

+ 19
- 6
src/main/javassist/CtClassType.java View File

@@ -179,6 +179,7 @@ class CtClassType extends CtClass {
}

public ClassFile getClassFile3(boolean doCompress) {
// quick path - no locking
ClassFile cfile = classfile;
if (cfile != null)
return cfile;
@@ -186,17 +187,29 @@ class CtClassType extends CtClass {
if (doCompress)
classPool.compress();

if (rawClassfile != null) {
byte[] rcfile;
synchronized (this) {
// repeat under lock to make sure we get a consistent result (classfile might have been set by another thread)
cfile = classfile;
if (cfile != null)
return cfile;

rcfile = rawClassfile;
}

if (rcfile != null) {
final ClassFile cf;
try {
ClassFile cf = new ClassFile(new DataInputStream(
new ByteArrayInputStream(rawClassfile)));
rawClassfile = null;
getCount = GET_THRESHOLD;
return setClassFile(cf);
cf = new ClassFile(new DataInputStream(new ByteArrayInputStream(rcfile)));
}
catch (IOException e) {
throw new RuntimeException(e.toString(), e);
}
getCount = GET_THRESHOLD;
synchronized (this) {
rawClassfile = null;
return setClassFile(cf);
}
}

InputStream fin = null;

Loading…
Cancel
Save