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

[Android] Check for icon stride instead assuming 4 BPP #15969

Merged
merged 1 commit into from
Apr 23, 2019

Conversation

peak3d
Copy link
Contributor

@peak3d peak3d commented Apr 23, 2019

Description

AndroidIcon read method assumes 4 byte per pixel icons.
We read currently ahead the provided source if pixel size is smaller.
This PR checks for this

Motivation and Context

playstore

  #00  pc 000000000000f6b4  /system/lib/libc.so (__memcpy_base+92)
  #01  pc 0000000001447c0c  /data/app/org.xbmc.kodi-1/lib/arm/libkodi.so (XFILE::CFileAndroidApp::ReadIcon(unsigned char**, unsigned int*, unsigned int*)+552)
  #02  pc 0000000000dd5670  /data/app/org.xbmc.kodi-1/lib/arm/libkodi.so (CBaseTexture::LoadFromFile(std::__ndk1::basic_string<char, std::__ndk1::char_traits<char>, std::__ndk1::allocator<char> > const&, unsigned int, unsigned int, bool, std::__ndk1::basic_string<char, std::__ndk1::char_traits<char>, std::__ndk1::allocator<char> > const&)+120)
  #03  pc 0000000000fa2224  /data/app/org.xbmc.kodi-1/lib/arm/libkodi.so (CImageLoader::DoWork()+344)
  #04  pc 0000000000c530ec  /data/app/org.xbmc.kodi-1/lib/arm/libkodi.so (CJobWorker::Process()+168)
  #05  pc 0000000000cc3d38  /data/app/org.xbmc.kodi-1/lib/arm/libkodi.so (CThread::Action()+40)
  #06  pc 0000000000cc2dc8  /data/app/org.xbmc.kodi-1/lib/arm/libkodi.so (CThread::staticThread(void*)+200)
  #07  pc 0000000000012f33  /system/lib/libc.so (__pthread_start(void*)+30)
  #08  pc 0000000000010ff7  /system/lib/libc.so (__start_thread+6)

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)

@peak3d peak3d added Type: Fix non-breaking change which fixes an issue Backport: Needed Platform: Android v19 Matrix labels Apr 23, 2019
@peak3d peak3d added this to the M** 19.0-alpha 1 milestone Apr 23, 2019
@peak3d peak3d merged commit 37112c1 into xbmc:master Apr 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Platform: Android 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

1 participant