Skip to content

GH-3497: Fix thread-unsafe static singleton in DefaultValuesWriterFactory causing use-after-free #3498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arouel wants to merge 1 commit into
base: master
Choose a base branch
from
+53 −5
Open

GH-3497: Fix thread-unsafe static singleton in DefaultValuesWriterFactory causing use-after-free #3498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions ...mn/src/main/java/org/apache/parquet/column/values/factory/DefaultValuesWriterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,12 @@ public class DefaultValuesWriterFactory implements ValuesWriterFactory {

private ValuesWriterFactory delegateFactory;

private static final ValuesWriterFactory DEFAULT_V1_WRITER_FACTORY = new DefaultV1ValuesWriterFactory();
private static final ValuesWriterFactory DEFAULT_V2_WRITER_FACTORY = new DefaultV2ValuesWriterFactory();

@Override
public void initialize(ParquetProperties properties) {
if (properties.getWriterVersion() == WriterVersion.PARQUET_1_0) {
delegateFactory = DEFAULT_V1_WRITER_FACTORY;
delegateFactory = new DefaultV1ValuesWriterFactory();
} else {
delegateFactory = DEFAULT_V2_WRITER_FACTORY;
delegateFactory = new DefaultV2ValuesWriterFactory();
}

delegateFactory.initialize(properties);
Expand Down
51 changes: 51 additions & 0 deletions ...rc/test/java/org/apache/parquet/column/values/factory/DefaultValuesWriterFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@
import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.FLOAT;
import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.INT32;
import static org.apache.parquet.schema.Types.required;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;

import java.lang.reflect.Field;
import org.apache.parquet.bytes.ByteBufferAllocator;
import org.apache.parquet.bytes.HeapByteBufferAllocator;
import org.apache.parquet.column.ColumnDescriptor;
import org.apache.parquet.column.ParquetProperties;
import org.apache.parquet.column.ParquetProperties.WriterVersion;
Expand Down Expand Up @@ -807,4 +811,51 @@ private void validateFallbackWriter(
validateWriterType(wr.initialWriter, initialWriterClass);
validateWriterType(wr.fallBackWriter, fallbackWriterClass);
}

/**
* Verifies that two independently built ParquetProperties instances produce ValuesWriters
* that use their own respective allocators, not a shared/stale reference from a static singleton.
*/
@Test
public void testFactoryIsolation_eachPropertiesUsesOwnAllocator() throws Exception {
ByteBufferAllocator allocatorA = new HeapByteBufferAllocator();
ByteBufferAllocator allocatorB = new HeapByteBufferAllocator();

ParquetProperties propsA = ParquetProperties.builder()
.withWriterVersion(WriterVersion.PARQUET_2_0)
.withAllocator(allocatorA)
.build();

ParquetProperties propsB = ParquetProperties.builder()
.withWriterVersion(WriterVersion.PARQUET_2_0)
.withAllocator(allocatorB)
.build();

ColumnDescriptor col = createColumnDescriptor(PrimitiveTypeName.INT32);

// Create a writer from propsA's factory
ValuesWriter writerA = propsA.getValuesWriterFactory().newValuesWriter(col);
// Then create a writer from propsB's factory (this used to overwrite the static singleton)
ValuesWriter writerB = propsB.getValuesWriterFactory().newValuesWriter(col);
// Now create another writer from propsA's factory
ValuesWriter writerA2 = propsA.getValuesWriterFactory().newValuesWriter(col);

// All writers from propsA should use allocatorA
assertSame("writerA should use allocatorA", allocatorA, getDictionaryWriterAllocator(writerA));
assertSame(
"writerA2 should use allocatorA (not allocatorB from later initialization)",
allocatorA,
getDictionaryWriterAllocator(writerA2));

// Writers from propsB should use allocatorB
assertSame("writerB should use allocatorB", allocatorB, getDictionaryWriterAllocator(writerB));
}

private static ByteBufferAllocator getDictionaryWriterAllocator(ValuesWriter writer) throws Exception {
FallbackValuesWriter fallback = (FallbackValuesWriter) writer;
DictionaryValuesWriter dictWriter = (DictionaryValuesWriter) fallback.initialWriter;
Field allocatorField = DictionaryValuesWriter.class.getDeclaredField("allocator");
allocatorField.setAccessible(true);
return (ByteBufferAllocator) allocatorField.get(dictWriter);
}
}