diff options
| author | Dani Megert | 2012-08-08 12:42:56 +0000 |
|---|---|---|
| committer | Dani Megert | 2012-08-08 12:42:56 +0000 |
| commit | 45591a0a8b4ec9665de02bc912049cfc8f04bf89 (patch) | |
| tree | 8e84b98c817e23b020ef8bcf6b66ceebe8fadf85 /bundles/org.eclipse.compare.core | |
| parent | d1474ddfea33573ac1aa02439e75e9fb4629bde8 (diff) | |
| download | eclipse.platform.team-45591a0a8b4ec9665de02bc912049cfc8f04bf89.tar.gz eclipse.platform.team-45591a0a8b4ec9665de02bc912049cfc8f04bf89.tar.xz eclipse.platform.team-45591a0a8b4ec9665de02bc912049cfc8f04bf89.zip | |
Additional fix for bug 123787: [Patch] Apply Patch error handlingv20120808-124256I20120814-0800I20120812-1736I20120810-1300I20120808-2000
for invalid formats
Diffstat (limited to 'bundles/org.eclipse.compare.core')
| -rw-r--r-- | bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java index 05b85eec7..f4540e5a2 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java @@ -323,6 +323,12 @@ public class PatchReader { continue; } break; + case '#': + break; + case 'I': + if (line.indexOf("Index:") == 0) //$NON-NLS-1$ + break; + //$FALL-THROUGH$ default: throw new IOException("Invalid patch"); //$NON-NLS-1$ } |