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

[UWP Renderer] Add a null check to inline action rendering #8228

Merged
merged 5 commits into from
Jan 13, 2023

Conversation

anna-dingler
Copy link
Contributor

@anna-dingler anna-dingler commented Jan 13, 2023

Related Issue

Fixes #8227

Description

If an inline action for Input.Text was a ShowCard action, we were setting the container to a nullptr. This caused an AccessViolation.

I added a null check so that we do not assign the container to a nullptr for ShowCard actions.

Sample Card

https://github.com/microsoft/AdaptiveCards/blob/release/uwp-v3.1.0/source/uwp/AdaptiveCardTestApp/Expected/SourceCards/v1.2.Tests.Input.Text.InlineAction.ShowCard.a724376.json

How Verified

Verified manually

Microsoft Reviewers: Open in CodeFlow

@anna-dingler anna-dingler merged commit 90b97be into release/uwp-v3.1.0 Jan 13, 2023
@anna-dingler anna-dingler deleted the anna/uwp-v3.1.0 branch January 13, 2023 18:35
anna-dingler added a commit that referenced this pull request Feb 22, 2023
* Switch to gotFocus (#8148) (#8150)

* Update custom.props

* [UWP] Update custom.props for object model release (#8225)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* [UWP Renderer] Add a null check to inline action rendering (#8228)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

* Add a null check for inline Actions

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* [UWP][Infra] Update nuget files for release (#6576) (#8240)

* [UWP][Infra] Update nuget files for release (#6576)

* Add new nuspec files

* Fix nuspec

* Update build copy script

* Add dependency to renderer

* 1.5 website schema explorer updates (#6550)

* Updating schema explorer properties

* adding tableCell to toc and attempting whitespace fix

* indentation fix

indentation fix

* Removing filtered prop

Removing filtered prop - it's auto generated in our build

Co-authored-by: RahulAmlekar <raamleka@microsoft.com>

* Custom.props to 1.0.0 for Object model build

* Update dependency version

Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>

* Remove blank lines

Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com>
Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>

---------

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com>
Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>
anna-dingler added a commit that referenced this pull request Feb 22, 2023
* Switch to gotFocus (#8148) (#8150)

* Update custom.props

* [UWP] Update custom.props for object model release (#8225)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* [UWP Renderer] Add a null check to inline action rendering (#8228)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

* Add a null check for inline Actions

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* Add title to button

---------

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
anna-dingler added a commit that referenced this pull request Feb 22, 2023
…ovided (#8232)

* Switch to gotFocus (#8148) (#8150)

* Update custom.props

* [UWP] Update custom.props for object model release (#8225)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* [UWP Renderer] Add a null check to inline action rendering (#8228)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

* Add a null check for inline Actions

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* Display title as tooltip

---------

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
anna-dingler added a commit that referenced this pull request Feb 23, 2023
* Switch to gotFocus (#8148) (#8150)

* Update custom.props

* [UWP] Update custom.props for object model release (#8225)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* [UWP Renderer] Add a null check to inline action rendering (#8228)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

* Add a null check for inline Actions

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* Update min/max handling for inputs

* [UWP][Infra] Update nuget files for release (#6576) (#8240)

* [UWP][Infra] Update nuget files for release (#6576)

* Add new nuspec files

* Fix nuspec

* Update build copy script

* Add dependency to renderer

* 1.5 website schema explorer updates (#6550)

* Updating schema explorer properties

* adding tableCell to toc and attempting whitespace fix

* indentation fix

indentation fix

* Removing filtered prop

Removing filtered prop - it's auto generated in our build

Co-authored-by: RahulAmlekar <raamleka@microsoft.com>

* Custom.props to 1.0.0 for Object model build

* Update dependency version

Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>

* Remove blank lines

Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com>
Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>

---------

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com>
Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>
Co-authored-by: Vsevolod <sevkorobot@gmail.com>
anna-dingler added a commit that referenced this pull request Feb 27, 2023
…8235)

* Switch to gotFocus (#8148) (#8150)

* Update custom.props

* [UWP] Update custom.props for object model release (#8225)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* [UWP Renderer] Add a null check to inline action rendering (#8228)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

* Add a null check for inline Actions

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* Add null check to MeetsRequirements

* Remove comment

---------

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
anna-dingler added a commit that referenced this pull request Mar 20, 2023
* Switch to gotFocus (#8148) (#8150)

* Update custom.props

* [UWP] Update custom.props for object model release (#8225)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* [UWP Renderer] Add a null check to inline action rendering (#8228)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

* Add a null check for inline Actions

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* Update fallback behavior

---------

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
anna-dingler added a commit that referenced this pull request Mar 20, 2023
* Switch to gotFocus (#8148) (#8150)

* Update custom.props

* [UWP] Update custom.props for object model release (#8225)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* [UWP Renderer] Add a null check to inline action rendering (#8228)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

* Add a null check for inline Actions

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* Update actionSet fallback

* Minor syntax update

* Create new hresult

---------

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
anna-dingler added a commit that referenced this pull request Mar 21, 2023
* Switch to gotFocus (#8148) (#8150)

* Update custom.props

* [UWP] Update custom.props for object model release (#8225)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* [UWP Renderer] Add a null check to inline action rendering (#8228)

* Update custom.props for object model release

* Updated Xcode version (#8222)

* removed build step as they are redundant (#8201)

* removed build step as they are redundant

* added pod installation step

* Add a null check for inline Actions

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>

* [UWP][Infra] Update nuget files for release (#6576) (#8240)

* [UWP][Infra] Update nuget files for release (#6576)

* Add new nuspec files

* Fix nuspec

* Update build copy script

* Add dependency to renderer

* 1.5 website schema explorer updates (#6550)

* Updating schema explorer properties

* adding tableCell to toc and attempting whitespace fix

* indentation fix

indentation fix

* Removing filtered prop

Removing filtered prop - it's auto generated in our build

Co-authored-by: RahulAmlekar <raamleka@microsoft.com>

* Custom.props to 1.0.0 for Object model build

* Update dependency version

Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>

* Remove blank lines

Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com>
Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>

* [UWP Renderer] Parse for SVG width and height (#8256)

* WIP: set raster height and width

* WIP: add template method

* WIP: parse svg for size

* Update resources and spacing

* update visualizer csproj

* Only set height

* Resolve PR comments

* Remove try catch blocks

* [UWP] Remove weak_ref from method headers and pass by value (#8295)

* Temp branch

* svg updates

* Pass by value

* Remove temp var

* Use make_weak

* Fix spacing

* Resolve PR comments

* Use image properties struct

* Resolve PR comments and handle errors

* Add test json

* Update custom props (#8329)

* Update the object model dependency (#8331)

---------

Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com>
Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>
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.

3 participants