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

Return early in case of maximum ammount of plugin resolution attempts #17679

Merged
merged 1 commit into from May 5, 2020

Conversation

enen92
Copy link
Member

@enen92 enen92 commented Apr 15, 2020

Description

At the moment kodi crashes if playing a plugin CFileItem that still has a plugin:// path in the dynPath after the limit of 5 resolution attempts has been reached.

Also, if the plugin:// path being played sets the resolved to an empty path (thus GetDynPath() falls back to path) same issue will occur.

Motivation and Context

Kodi should not crash :)

How Has This Been Tested?

Easiest way to reproduce the problem in Kodi master:

  • Install IMDb Trailers video addon from the official repo
  • Enter the plugin
  • Navigate to coming soon
  • Play the trailer of "Trolls: Tour Mundial"

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed

@enen92 enen92 added Type: Fix non-breaking change which fixes an issue v19 Matrix labels Apr 15, 2020
@enen92 enen92 added this to the Matrix 19.0-alpha 1 milestone Apr 15, 2020
@enen92 enen92 added the Don't merge PR that should not be merged (yet) label Apr 15, 2020
Copy link
Member

@Rechi Rechi left a comment

Choose a reason for hiding this comment

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

Please follow the current code guidelines.

xbmc/Application.cpp Outdated Show resolved Hide resolved
@enen92 enen92 removed the Don't merge PR that should not be merged (yet) label May 5, 2020
@enen92 enen92 requested a review from phunkyfish May 5, 2020 12:39
Copy link
Contributor

@phunkyfish phunkyfish left a comment

Choose a reason for hiding this comment

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

Looks good.

@enen92 enen92 merged commit 023207c into xbmc:master May 5, 2020
Maven85 pushed a commit to Maven85/kodi that referenced this pull request May 5, 2020
Return early in case of maximum ammount of plugin resolution attempts
Maven85 pushed a commit to Maven85/kodi that referenced this pull request May 5, 2020
Return early in case of maximum ammount of plugin resolution attempts
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 3, 2020
Return early in case of maximum ammount of plugin resolution attempts
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 4, 2020
Return early in case of maximum ammount of plugin resolution attempts
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 4, 2020
Return early in case of maximum ammount of plugin resolution attempts
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 5, 2020
Return early in case of maximum ammount of plugin resolution attempts
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 5, 2020
Return early in case of maximum ammount of plugin resolution attempts
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020
Return early in case of maximum ammount of plugin resolution attempts
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020
Return early in case of maximum ammount of plugin resolution attempts
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020
Return early in case of maximum ammount of plugin resolution attempts
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 7, 2020
Return early in case of maximum ammount of plugin resolution attempts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Fix non-breaking change which fixes an issue v19 Matrix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants