Merge r6707 as a preventative measure (it's generally a good idea to

set call-by-reference arguments, especially when the function comments
says that they always are set.)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6719

diff --git a/coregrind/m_debuginfo/debuginfo.c b/coregrind/m_debuginfo/debuginfo.c
index 6cebc8ba12d1434329456d21806fb6da2553b8df..a1032528f57dbe37cc264ab6cbc493f5446efeba 100644 (file)
--- a/coregrind/m_debuginfo/debuginfo.c
+++ b/coregrind/m_debuginfo/debuginfo.c
@@ -599,8 +599,11 @@ Bool VG_(get_filename_linenum) ( Addr a,
               (dirname != NULL && dirname_available != NULL) );
 
    search_all_loctabs ( a, &si, &locno );
-   if (si == NULL) 
+   if (si == NULL) {
+      if (dirname_available) *dirname_available = False;
       return False;
+   }
+
    VG_(strncpy_safely)(filename, si->loctab[locno].filename, n_filename);
    *lineno = si->loctab[locno].lineno;