Skip to content
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.

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

Cherry-Pick: Handle long interned strings in MSI parsing #25096

Merged
merged 1 commit into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changes/24720-msi-large-interned-strings
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Fixed MSI parsing for packages including long interned strings (e.g. licenses for the OpenVPN Connect installer)
20 changes: 18 additions & 2 deletions pkg/file/msi.go
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,25 @@ func decodeStrings(dataReader, poolReader io.Reader) ([]string, error) {
}
return nil, fmt.Errorf("failed to read pool entry: %w", err)
}
stringEntrySize := int(stringEntry.Size)

// For string pool entries too long for the size to fit in a single uint16, entry size is 8 bytes instead of 4,
// with the first two bytes as zeroes, the next two are the two most-significant bytes of the size, shifted
// 17 (?!?) bits to the left, the following two are the less-significant bits of the size, and the last two are
// the reference count. Verified with the OpenVPN Connect v3 installer, which has a large string blob for
// licenses where a 17-bit shift captures the length properly.
if stringEntry.Size == 0 && stringEntry.RefCount != 0 {
stringEntrySize = int(stringEntry.RefCount) << 17
err := binary.Read(poolReader, binary.LittleEndian, &stringEntry)
if err != nil {
return nil, fmt.Errorf("failed to read large string pool entry: %w", err)
}
stringEntrySize += int(stringEntry.Size)
}

buf.Reset()
buf.Grow(int(stringEntry.Size))
_, err = io.CopyN(&buf, dataReader, int64(stringEntry.Size))
buf.Grow(stringEntrySize)
_, err = io.CopyN(&buf, dataReader, int64(stringEntrySize))
if err != nil {
return nil, fmt.Errorf("failed to read string data: %w", err)
}
Expand Down
Loading