mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

Browse Source
This commit is contained in:
John Preston
2016-01-31 21:01:05 +03:00
parent fb4ee55ffa 17a319fdb3
commit dd26de7dd2
6 changed files with 129 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Telegram/SourceFiles/logs.cpp
View File

@@ -708,41 +708,47 @@ namespace SignalHandlers {
#if defined Q_OS_MAC || defined Q_OS_LINUX32 || defined Q_OS_LINUX64
ucontext_t *uc = (ucontext_t*)ucontext;
void *addresses[128] = { 0 };
void *caller = 0;
#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
/* OSX < 10.6 */
#if defined(__x86_64__)
caller = (void*)uap->uc_mcontext->__ss.__rip;
caller = (void*)uc->uc_mcontext->__ss.__rip;
#elif defined(__i386__)
caller = (void*)uap->uc_mcontext->__ss.__eip;
caller = (void*)uc->uc_mcontext->__ss.__eip;
#else
caller = (void*)uap->uc_mcontext->__ss.__srr0;
caller = (void*)uc->uc_mcontext->__ss.__srr0;
#endif
#elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6)
/* OSX >= 10.6 */
#if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__)
caller = (void*)uc->uc_mcontext->__ss.__rip;
#else
caller = (void*)uap->uc_mcontext->__ss.__eip;
caller = (void*)uc->uc_mcontext->__ss.__eip;
#endif
#elif defined(__linux__)
/* Linux */
#if defined(__i386__)
caller = (void*)uap->uc_mcontext.gregs[14]; /* Linux 32 */
caller = (void*)uc->uc_mcontext.gregs[14]; /* Linux 32 */
#elif defined(__X86_64__) || defined(__x86_64__)
caller = (void*)uap->uc_mcontext.gregs[16]; /* Linux 64 */
caller = (void*)uc->uc_mcontext.gregs[16]; /* Linux 64 */
#elif defined(__ia64__) /* Linux IA64 */
caller = (void*)uap->uc_mcontext.sc_ip;
caller = (void*)uc->uc_mcontext.sc_ip;
#endif
#endif
void *addresses[132] = { 0 };
size_t size = backtrace(addresses, 128);
/* overwrite sigaction with caller's address */
if (caller) addresses[1] = caller;
if (caller) {
for (int i = size; i > 1; --i) {
addresses[i + 3] = addresses[i];
}
addresses[2] = (void*)0x1;
addresses[3] = caller;
addresses[4] = (void*)0x1;
}
#ifdef Q_OS_MAC
dump() << "\nBase image addresses:\n";