• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28352 (tree)
Time2018-09-08 00:48:31
Authorstefankueng

Log Message

Check for null pointer, just in case.

Change Summary

Incremental Difference

--- trunk/src/SVN/SVNConflictInfo.cpp (revision 28351)
+++ trunk/src/SVN/SVNConflictInfo.cpp (revision 28352)
@@ -1,6 +1,6 @@
1-// TortoiseSVN - a Windows shell extension for easy version control
1+// TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2016-2017 - TortoiseSVN
3+// Copyright (C) 2016-2018 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -580,6 +580,8 @@
580580
581581 void SVNConflictInfo::notifyCallback(void *baton, const svn_wc_notify_t *notify, apr_pool_t * /*pool*/)
582582 {
583+ if (notify == nullptr)
584+ return;
583585 SVNConflictInfo * pThis = (SVNConflictInfo *)baton;
584586 if (pThis->m_pProgress)
585587 {
Show on old repository browser