i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed a warning.

Browse Source 
* fStyleMap could be deleted more than once in certain situations.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28563 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-11-08 13:22:33 +00:00
parent 3d198cd3ae
commit 3bd8c2318f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp
+2 -3
View File
@@ -254,17 +254,15 @@ StyledTextImporter::_Import(Icon* icon, const char *text, text_run_array *runs)
return B_CANCELED; return B_CANCELED;
} }
StyleContainer* styles = icon->Styles();
// import run colors as styles // import run colors as styles
if (runs) { if (runs) {
delete[] fStyleMap;
fStyleMap = new struct style_map[runs->count]; fStyleMap = new struct style_map[runs->count];
for (int32 i = 0; runs && i < runs->count; i++) { for (int32 i = 0; runs && i < runs->count; i++) {
_AddStyle(icon, &runs->runs[i]); _AddStyle(icon, &runs->runs[i]);
} }
} }
int32 currentRun = 0; int32 currentRun = 0;
text_run *run = NULL; text_run *run = NULL;
if (runs) if (runs)
@@ -344,6 +342,7 @@ StyledTextImporter::_Import(Icon* icon, const char *text, text_run_array *runs)
} }
delete[] fStyleMap; delete[] fStyleMap;
fStyleMap = NULL;
return B_OK; return B_OK;
} }