OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d1d3d72
)
DiffItem.cpp: Fix infinite loop when deleting the first item and rescanning
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Tue, 12 Mar 2019 14:22:24 +0000
(23:22 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Tue, 12 Mar 2019 14:22:24 +0000
(23:22 +0900)
Src/DiffItem.cpp
patch
|
blob
|
history
diff --git
a/Src/DiffItem.cpp
b/Src/DiffItem.cpp
index
f8e844e
..
ffee582
100644
(file)
--- a/
Src/DiffItem.cpp
+++ b/
Src/DiffItem.cpp
@@
-157,7
+157,7
@@
void DIFFITEM::DelinkFromSiblings()
parent->children = Flink;
}
}
- if (Blink != nullptr)
+ if (Blink != nullptr
&& Blink->Flink != nullptr
)
Blink->Flink = Flink;
if (Flink != nullptr)
Flink->Blink = Blink;