diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2015-03-22 21:29:31 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-24 17:47:49 +0300 |
| commit | 3cf120be6764e4c7bb04a84f19cd0806a9cdeec0 (patch) | |
| tree | dd2dbc55d47c3438bc30bebb2e4cba52e4faa128 | |
| parent | d22c56819cd5ded2e693d1fec4934a99d2b5d659 (diff) | |
OSX: fix 1 leak ( found and fixed by marcclintdion ) and 1 possible leak in dragndrop, backport to 2.74
| -rw-r--r-- | intern/ghost/intern/GHOST_EventDragnDrop.h | 1 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_EventDragnDrop.h b/intern/ghost/intern/GHOST_EventDragnDrop.h index c51f9568087..b7bf37c99d8 100644 --- a/intern/ghost/intern/GHOST_EventDragnDrop.h +++ b/intern/ghost/intern/GHOST_EventDragnDrop.h @@ -112,6 +112,7 @@ public: for (i = 0; i < strArray->count; i++) free(strArray->strings[i]); + free(strArray->strings); free(strArray); } break; diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 095c738e1e0..ed1200b967c 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -882,7 +882,10 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType if (!strArray) return GHOST_kFailure; strArray->count = [droppedArray count]; - if (strArray->count == 0) return GHOST_kFailure; + if (strArray->count == 0) { + free(strArray); + return GHOST_kFailure; + } strArray->strings = (GHOST_TUns8**) malloc(strArray->count*sizeof(GHOST_TUns8*)); |