From 4479476230855df1b28e7fcc47183ee3cdf4979f Mon Sep 17 00:00:00 2001 From: Don Ho Date: Mon, 21 Jul 2014 06:07:19 +0000 Subject: [PATCH] [BUG_FIXED] Prevent Notepad++ from crash due to indexation in clipbordHistory object. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1262 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/installer/themes/Bespin.xml | 1 - PowerEditor/installer/themes/Black board.xml | 1 - PowerEditor/installer/themes/Choco.xml | 1 - PowerEditor/installer/themes/Deep Black.xml | 1 - PowerEditor/installer/themes/Hello Kitty.xml | 1 - PowerEditor/installer/themes/HotFudgeSundae.xml | 1 - PowerEditor/installer/themes/Mono Industrial.xml | 1 - PowerEditor/installer/themes/Monokai.xml | 1 - PowerEditor/installer/themes/MossyLawn.xml | 1 - PowerEditor/installer/themes/Navajo.xml | 1 - PowerEditor/installer/themes/Obsidian.xml | 1 - PowerEditor/installer/themes/Plastic Code Wrap.xml | 1 - PowerEditor/installer/themes/Ruby Blue.xml | 1 - PowerEditor/installer/themes/Solarized-light.xml | 1 - PowerEditor/installer/themes/Solarized.xml | 1 - PowerEditor/installer/themes/Twilight.xml | 1 - PowerEditor/installer/themes/Vibrant Ink.xml | 1 - PowerEditor/installer/themes/Zenburn.xml | 1 - PowerEditor/installer/themes/khaki.xml | 1 - PowerEditor/installer/themes/vim Dark Blue.xml | 1 - .../WinControls/ClipboardHistory/clipboardHistoryPanel.cpp | 5 ++++- PowerEditor/src/stylers.model.xml | 1 - 22 files changed, 4 insertions(+), 22 deletions(-) diff --git a/PowerEditor/installer/themes/Bespin.xml b/PowerEditor/installer/themes/Bespin.xml index d8949dc2..3a0b83ba 100644 --- a/PowerEditor/installer/themes/Bespin.xml +++ b/PowerEditor/installer/themes/Bespin.xml @@ -723,7 +723,6 @@ Credits: - diff --git a/PowerEditor/installer/themes/Black board.xml b/PowerEditor/installer/themes/Black board.xml index da2c3c8f..3bcfb613 100644 --- a/PowerEditor/installer/themes/Black board.xml +++ b/PowerEditor/installer/themes/Black board.xml @@ -721,7 +721,6 @@ Credits: - diff --git a/PowerEditor/installer/themes/Choco.xml b/PowerEditor/installer/themes/Choco.xml index 9f584de6..dba942ce 100644 --- a/PowerEditor/installer/themes/Choco.xml +++ b/PowerEditor/installer/themes/Choco.xml @@ -721,7 +721,6 @@ Credits: - diff --git a/PowerEditor/installer/themes/Deep Black.xml b/PowerEditor/installer/themes/Deep Black.xml index 1d1f11b9..d986aeac 100644 --- a/PowerEditor/installer/themes/Deep Black.xml +++ b/PowerEditor/installer/themes/Deep Black.xml @@ -688,7 +688,6 @@ http://sourceforge.net/donate/index.php?group_id=95717 - diff --git a/PowerEditor/installer/themes/Hello Kitty.xml b/PowerEditor/installer/themes/Hello Kitty.xml index b4be34e6..99a06855 100644 --- a/PowerEditor/installer/themes/Hello Kitty.xml +++ b/PowerEditor/installer/themes/Hello Kitty.xml @@ -694,7 +694,6 @@ so your enhanced file can be included in Notepad++ future release. - diff --git a/PowerEditor/installer/themes/HotFudgeSundae.xml b/PowerEditor/installer/themes/HotFudgeSundae.xml index 01425725..a6e7d4d8 100644 --- a/PowerEditor/installer/themes/HotFudgeSundae.xml +++ b/PowerEditor/installer/themes/HotFudgeSundae.xml @@ -701,7 +701,6 @@ Installation: - diff --git a/PowerEditor/installer/themes/Mono Industrial.xml b/PowerEditor/installer/themes/Mono Industrial.xml index 80639363..c791574b 100644 --- a/PowerEditor/installer/themes/Mono Industrial.xml +++ b/PowerEditor/installer/themes/Mono Industrial.xml @@ -721,7 +721,6 @@ Credits: - diff --git a/PowerEditor/installer/themes/Monokai.xml b/PowerEditor/installer/themes/Monokai.xml index c25d3ab3..d8f263b2 100644 --- a/PowerEditor/installer/themes/Monokai.xml +++ b/PowerEditor/installer/themes/Monokai.xml @@ -721,7 +721,6 @@ Credits: - diff --git a/PowerEditor/installer/themes/MossyLawn.xml b/PowerEditor/installer/themes/MossyLawn.xml index 0a756582..7a75702e 100644 --- a/PowerEditor/installer/themes/MossyLawn.xml +++ b/PowerEditor/installer/themes/MossyLawn.xml @@ -702,7 +702,6 @@ Installation: - diff --git a/PowerEditor/installer/themes/Navajo.xml b/PowerEditor/installer/themes/Navajo.xml index a0275bb3..c20d132c 100644 --- a/PowerEditor/installer/themes/Navajo.xml +++ b/PowerEditor/installer/themes/Navajo.xml @@ -700,7 +700,6 @@ Installation: - diff --git a/PowerEditor/installer/themes/Obsidian.xml b/PowerEditor/installer/themes/Obsidian.xml index e2ac4fd6..77055c40 100644 --- a/PowerEditor/installer/themes/Obsidian.xml +++ b/PowerEditor/installer/themes/Obsidian.xml @@ -724,7 +724,6 @@ Notepad++ Custom Style - diff --git a/PowerEditor/installer/themes/Plastic Code Wrap.xml b/PowerEditor/installer/themes/Plastic Code Wrap.xml index 1ea5bb06..7d8de25c 100644 --- a/PowerEditor/installer/themes/Plastic Code Wrap.xml +++ b/PowerEditor/installer/themes/Plastic Code Wrap.xml @@ -733,7 +733,6 @@ Credits: - diff --git a/PowerEditor/installer/themes/Ruby Blue.xml b/PowerEditor/installer/themes/Ruby Blue.xml index 21efde80..0643aed2 100644 --- a/PowerEditor/installer/themes/Ruby Blue.xml +++ b/PowerEditor/installer/themes/Ruby Blue.xml @@ -570,7 +570,6 @@ http://sourceforge.net/donate/index.php?group_id=95717 - diff --git a/PowerEditor/installer/themes/Solarized-light.xml b/PowerEditor/installer/themes/Solarized-light.xml index 457476bb..b56bb22a 100644 --- a/PowerEditor/installer/themes/Solarized-light.xml +++ b/PowerEditor/installer/themes/Solarized-light.xml @@ -711,7 +711,6 @@ Installation: - diff --git a/PowerEditor/installer/themes/Solarized.xml b/PowerEditor/installer/themes/Solarized.xml index f31aea46..1366ab75 100644 --- a/PowerEditor/installer/themes/Solarized.xml +++ b/PowerEditor/installer/themes/Solarized.xml @@ -711,7 +711,6 @@ Installation: - diff --git a/PowerEditor/installer/themes/Twilight.xml b/PowerEditor/installer/themes/Twilight.xml index e467dc85..edf82ad6 100644 --- a/PowerEditor/installer/themes/Twilight.xml +++ b/PowerEditor/installer/themes/Twilight.xml @@ -721,7 +721,6 @@ Credits: - diff --git a/PowerEditor/installer/themes/Vibrant Ink.xml b/PowerEditor/installer/themes/Vibrant Ink.xml index 610901d5..ac14bd39 100644 --- a/PowerEditor/installer/themes/Vibrant Ink.xml +++ b/PowerEditor/installer/themes/Vibrant Ink.xml @@ -693,7 +693,6 @@ http://sourceforge.net/donate/index.php?group_id=95717 - diff --git a/PowerEditor/installer/themes/Zenburn.xml b/PowerEditor/installer/themes/Zenburn.xml index fdf61f23..6a1997fb 100644 --- a/PowerEditor/installer/themes/Zenburn.xml +++ b/PowerEditor/installer/themes/Zenburn.xml @@ -778,7 +778,6 @@ License: Feel free to modify this style and re-release it. This styl - diff --git a/PowerEditor/installer/themes/khaki.xml b/PowerEditor/installer/themes/khaki.xml index c4eedee9..996dec6b 100644 --- a/PowerEditor/installer/themes/khaki.xml +++ b/PowerEditor/installer/themes/khaki.xml @@ -700,7 +700,6 @@ Installation: - diff --git a/PowerEditor/installer/themes/vim Dark Blue.xml b/PowerEditor/installer/themes/vim Dark Blue.xml index c6de2b77..10a92b38 100644 --- a/PowerEditor/installer/themes/vim Dark Blue.xml +++ b/PowerEditor/installer/themes/vim Dark Blue.xml @@ -690,7 +690,6 @@ - diff --git a/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.cpp b/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.cpp index d0d0dbe0..9a70c20d 100644 --- a/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.cpp +++ b/PowerEditor/src/WinControls/ClipboardHistory/clipboardHistoryPanel.cpp @@ -180,10 +180,13 @@ void ClipboardHistoryPanel::addToClipboadHistory(ClipboardData cbd) void ClipboardHistoryPanel::drawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) { + if (lpDrawItemStruct->itemID >= _clipboardDataVector.size()) + return; + //printStr(TEXT("OK")); COLORREF fgColor = _lbFgColor == -1?black:_lbFgColor; // fg black by default COLORREF bgColor = _lbBgColor == -1?white:_lbBgColor; // bg white by default - + StringArray sa(_clipboardDataVector[lpDrawItemStruct->itemID], MAX_DISPLAY_LENGTH); TCHAR *ptStr = (TCHAR *)sa.getPointer(); diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml index 1af55f19..19a8e173 100644 --- a/PowerEditor/src/stylers.model.xml +++ b/PowerEditor/src/stylers.model.xml @@ -789,7 +789,6 @@ -