Repository navigation
Commit f4e2bc9
authored
[macOS] Fix FlutterTextInputPluginTest crash (flutter#194581)
Fix was generated by gemini:
In FlutterTextInputPluginTest.mm, TextInputTestViewController previously
overrode `-createFlutterViewWithMTLDevice:commandQueue:` to return
`OCMClassMock([NSView class])`, which allocates a 72-byte
`OCClassMockObject` (`NSProxy` subclass) rather than a real `NSView`.
https://github.com/flutter/flutter/blob/449fb191435ed8ae509b71623142fc35e6932f46/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputPluginTest.mm#L49-L52
When `-[FlutterViewController loadView]` added that mock to a real
NSView (`FlutterViewWrapper`) via `-[NSView addSubview:]`, AppKit
directly accessed `NSView` instance variables at offsets beyond the
72-byte `OCClassMockObject` allocation, corrupting adjacent blocks in
the malloc freelist and triggering a libsystem_malloc EXC_BREAKPOINT
(memory corruption of free block) on subsequent allocations.
https://github.com/flutter/flutter/blob/449fb191435ed8ae509b71623142fc35e6932f46/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm#L384-L400
To fix this, `TextInputTestViewController` now overrides `-loadView` to
set `self.view` to a real `NSView` instance and `-flutterView` to return
the `OCMClassMock([FlutterView class])` directly without adding the
`NSProxy` mock to the AppKit view hierarchy.
---
Tested and verified manually:
I was able to re-create the crash locally and therefore verify it was
fixed using:
`./engine/src/out/host_release_arm64/flutter_desktop_darwin_unittests
--gtest_shuffle --gtest_repeat=10`
Fixes flutter#194251.
## Pre-launch Checklist
- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [AI contribution guidelines] and understand my
responsibilities, or I am not using AI tools.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant in-code documentation (doc comments with
`///`).
- [x] If this PR introduces a new feature or capability, I created and
linked a website documentation issue or PR in [flutter/website] (or
verified none is needed).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.
If you need help, consider asking for advice on the #hackers-new channel
on [Discord].
If this change needs to override an active code freeze, provide a
comment explaining why. The code freeze workflow can be overridden by
code reviewers. See pinned issues for any active code freezes with
guidance.
**Note**: The Flutter team is currently trialing the use of [Gemini Code
Assist for
GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code).
Comments from the `gemini-code-assist` bot should not be taken as
authoritative feedback from the Flutter team. If you find its comments
useful you can update your code accordingly, but if you are unsure or
disagree with the feedback, please feel free to wait for a Flutter team
member's review for guidance on which automated comments should be
addressed.
<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[AI contribution guidelines]:
https://github.com/flutter/flutter/blob/main/CONTRIBUTING.ai.md
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[flutter/website]: https://github.com/flutter/website
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md1 parent f2cf71a commit f4e2bc9
1 file changed
Lines changed: 11 additions & 4 deletions
File tree
- engine/src/flutter/shell/platform/darwin/macos/framework/Source
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
52 | 59 | | |
53 | 60 | | |
54 | 61 | | |
| |||
0 commit comments