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

DeltaStreamReader should interpret instruction with size 0 as 0x10000 #818

Merged
merged 1 commit into from
Sep 20, 2022

Conversation

marcin-krystianc
Copy link
Contributor

Fixes: #817

https://git-scm.com/docs/pack-format/2.31.0#_instruction_to_copy_from_base_object:
"In its most compact form, this instruction only takes up one byte (0x80) with both offset and size omitted, which will have default values zero. There is another exception: size zero is automatically converted to 0x10000."

https://git-scm.com/docs/pack-format/2.31.0#_instruction_to_copy_from_base_object:
"In its most compact form, this instruction only takes up one byte (0x80) with both offset and size omitted, which will have default values zero. There is another exception: size zero is automatically converted to 0x10000."
@AArnott AArnott added this to the v3.5 milestone Sep 20, 2022
@AArnott AArnott changed the base branch from main to v3.5 September 20, 2022 12:25
Copy link
Collaborator

@AArnott AArnott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the analysis and the fix!
I rebased your commit so we can service 3.5 with this fix rather than 3.6, which would keep this bug fix out of most people's hands for a while longer.

@AArnott AArnott merged commit a908c6d into dotnet:v3.5 Sep 20, 2022
@marcin-krystianc marcin-krystianc deleted the marcink-20200920-size0 branch September 20, 2022 12:46
brighid-bot added a commit to cythral/brighid-commands that referenced this pull request Sep 20, 2022
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
|
[Nerdbank.GitVersioning](https://togithub.com/dotnet/Nerdbank.GitVersioning)
| nuget | patch | `3.5.109` -> `3.5.113` |

---

### Release Notes

<details>
<summary>dotnet/Nerdbank.GitVersioning</summary>

###
[`v3.5.113`](https://togithub.com/dotnet/Nerdbank.GitVersioning/releases/v3.5.113)

#### What's Changed

- DeltaStreamReader should interpret instruction with size 0 as 0x10000
by [@&#8203;marcin-krystianc](https://togithub.com/marcin-krystianc) in
dotnet/Nerdbank.GitVersioning#818

#### New Contributors

- [@&#8203;marcin-krystianc](https://togithub.com/marcin-krystianc) made
their first contribution in
dotnet/Nerdbank.GitVersioning#818

**Full Changelog**:
dotnet/Nerdbank.GitVersioning@v3.5.112...v3.5.113

###
[`v3.5.112`](https://togithub.com/dotnet/Nerdbank.GitVersioning/releases/v3.5.112)

#### What's Changed

- Fix break in tests from VS 17.3 by
[@&#8203;AArnott](https://togithub.com/AArnott) in
dotnet/Nerdbank.GitVersioning#804
- Fix `Stream.Seek` implementations to reliably shift position as
required by [@&#8203;AArnott](https://togithub.com/AArnott) in
dotnet/Nerdbank.GitVersioning#816

**Full Changelog**:
dotnet/Nerdbank.GitVersioning@v3.5.109...v3.5.112

</details>

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click
this checkbox.

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ManagedGit: Attempted to read past the end of the stream.
2 participants