You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/10/22 06:02:17 UTC
svn commit: r1534480 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_subr/win32_crashrpt.c
Author: svn-role
Date: Tue Oct 22 04:02:16 2013
New Revision: 1534480
URL: http://svn.apache.org/r1534480
Log:
Merge r1532023 from trunk:
* r1532023
Resolve possible segfault in the win32 crash handler.
Justification:
The crash handler shouldn't crash, but report the original
crash.
Votes:
+1: rhuijben, stefan2, ivan
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_subr/win32_crashrpt.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1532023
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1534480&r1=1534479&r2=1534480&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Oct 22 04:02:16 2013
@@ -118,14 +118,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1532023
- Resolve possible segfault in the win32 crash handler.
- Justification:
- The crash handler shouldn't crash, but report the original
- crash.
- Votes:
- +1: rhuijben, stefan2, ivan
-
* r1534102
On Windows: stop linking agains psapi.dll.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/win32_crashrpt.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/win32_crashrpt.c?rev=1534480&r1=1534479&r2=1534480&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/win32_crashrpt.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/win32_crashrpt.c Tue Oct 22 04:02:16 2013
@@ -427,13 +427,15 @@ write_var_values(PSYMBOL_INFO sym_info,
format_value(value_str, sym_info->ModBase, sym_info->TypeIndex,
(void *)var_data);
- fprintf(log_file, "%s=%s", sym_info->Name, value_str);
+ fprintf(log_file, "%.*s=%s", (int)sym_info->NameLen, sym_info->Name,
+ value_str);
}
if (!log_params && sym_info->Flags & SYMFLAG_LOCAL)
{
format_value(value_str, sym_info->ModBase, sym_info->TypeIndex,
(void *)var_data);
- fprintf(log_file, " %s = %s\n", sym_info->Name, value_str);
+ fprintf(log_file, " %.*s = %s\n", (int)sym_info->NameLen,
+ sym_info->Name, value_str);
}
return TRUE;
@@ -466,8 +468,10 @@ write_function_detail(STACKFRAME64 stack
if (SymFromAddr_(proc, stack_frame.AddrPC.Offset, &func_disp, pIHS))
{
fprintf(log_file,
- "#%d 0x%08I64x in %.200s(",
- nr_of_frame, stack_frame.AddrPC.Offset, pIHS->Name);
+ "#%d 0x%08I64x in %.*s(",
+ nr_of_frame, stack_frame.AddrPC.Offset,
+ pIHS->NameLen > 200 ? 200 : (int)pIHS->NameLen,
+ pIHS->Name);
/* restrict symbol enumeration to this frame only */
ih_stack_frame.InstructionOffset = stack_frame.AddrPC.Offset;