Ticket #10396: 0004-Remove-variable-length-arrays-of-non-PODs.patch

src/add-ons/media/media-add-ons/mixer/MixerCore.cpp

@@ -16 +16 @@
 #include <BufferProducer.h>
 #include <MediaNode.h>
 #include <RealtimeAlloc.h>
+#include <StackOrHeapArray.h>
 #include <StopWatch.h>
 #include <TimeSource.h>
 
@@ -520 +521 @@
     uint64 bufferIndex = 0;
 #endif
 
-    RtList<chan_info> inputChanInfos[MAX_CHANNEL_TYPES];
-    RtList<chan_info> mixChanInfos[fMixBufferChannelCount];
+    typedef RtList<chan_info> chan_info_list;
+    chan_info_list inputChanInfos[MAX_CHANNEL_TYPES];
+    BStackOrHeapArray<chan_info_list, 16> mixChanInfos(fMixBufferChannelCount);
         // TODO: this does not support changing output channel count
 
     bigtime_t eventTime = timeBase;

src/apps/fontdemo/FontDemoView.cpp

@@ -20 +20 @@
 #include <Message.h>
 #include <Shape.h>
 #include <String.h>
+#include <StackOrHeapArray.h>
 
 #include "messages.h"
 
@@ -99 +100 @@
     view->SetFont(&fFont, B_FONT_ALL);
 
     const size_t size = fString.CountChars();
-    BRect boundBoxes[size];
+    BStackOrHeapArray<BRect, 64> boundBoxes(size);
 
     if (OutLineLevel())
         fFont.GetGlyphShapes(fString, size, fShapes);
@@ -456 +457 @@
         delete fBitmap;
         fBitmap = NULL;
     }
-}
- No newline at end of file
+}

src/apps/icon-o-matic/shape/PathManipulator.cpp

@@ -14 +14 @@
 #include <Message.h>
 #include <MenuItem.h>
 #include <PopUpMenu.h>
+#include <StackOrHeapArray.h>
 #include <Window.h>
 
 #include "cursors.h"
@@ -1703 +1704 @@
         int32 count = fromSelection ? fSelection->CountItems()
                                     : fPath->CountPoints();
         int32 indices[count];
-        control_point points[count];
+        BStackOrHeapArray<control_point, 64> points(count);
 
         // init indices and points
         for (int32 i = 0; i < count; i++) {

src/apps/soundrecorder/VUView.cpp

@@ -11 +11 @@
 
 #include <MediaDefs.h>
 #include <Screen.h>
+#include <StackOrHeapArray.h>
 #include <Window.h>
 
 #include "DrawingTidbits.h"
@@ -108 +109 @@
 void
 VUView::_RenderLoop()
 {
-    rgb_color levels[fLevelCount][2];
+    BStackOrHeapArray<rgb_color[2], 64> levels(fLevelCount);
     
     for (int32 i = 0; i < fLevelCount; i++) {
         levels[i][0] = levels[i][1] = back_color;   

src/apps/terminal/BasicTerminalBuffer.cpp

@@ -18 +18 @@
 
 #include <algorithm>
 
+#include <StackOrHeapArray.h>
 #include <String.h>
 
 #include "TermConst.h"
@@ -537 +538 @@
     int32 patternByteLen = strlen(_pattern);
 
     // convert pattern to UTF8Char array
-    UTF8Char pattern[patternByteLen];
+    BStackOrHeapArray<UTF8Char, 64> pattern(patternByteLen);
     int32 patternLen = 0;
     while (*_pattern != '\0') {
         int32 charLen = UTF8Char::ByteCount(*_pattern);

src/kits/app/ServerLink.cpp

@@ -25 +25 @@
 #include <GradientConic.h>
 #include <Region.h>
 #include <Shape.h>
+#include <StackOrHeapArray.h>
 
 #include <ServerProtocol.h>
 
@@ -96 +97 @@
     fReceiver->Read(&opCount, sizeof(int32));
     fReceiver->Read(&ptCount, sizeof(int32));
 
-    uint32 opList[opCount];
+    BStackOrHeapArray<uint32, 64> opList(opCount);
     if (opCount > 0)
         fReceiver->Read(opList, opCount * sizeof(uint32));
 
-    BPoint ptList[ptCount];
+    BStackOrHeapArray<BPoint, 64> ptList(ptCount);
     if (ptCount > 0)
         fReceiver->Read(ptList, ptCount * sizeof(BPoint));
 

src/kits/support/ArchivingManagers.cpp

@@ -11 +11 @@
 #include <syslog.h>
 #include <typeinfo>
 
+#include <StackOrHeapArray.h>
+
 
 namespace BPrivate {
 namespace Archiving {
@@ -163 +165 @@
     if (archiver == fCreator && fError == B_OK) {
         // first, we must sort the objects into the order they were archived in
         typedef std::pair<BMessage*, const BArchivable*> ArchivePair;
-        ArchivePair pairs[fTokenMap.size()];
+        BStackOrHeapArray<ArchivePair, 64> pairs(fTokenMap.size());
 
         for(TokenMap::iterator it = fTokenMap.begin(), end = fTokenMap.end();
                 it != end; it++) {

src/servers/app/ServerApp.cpp

@@ -34 +34 @@
 #include <ScrollBar.h>
 #include <Shape.h>
 #include <String.h>
+#include <StackOrHeapArray.h>
 
 #include <FontPrivate.h>
 #include <MessengerPrivate.h>
@@ -1856 +1857 @@
                 size = 0.0f;
             }
 
-            // TODO: don't use the stack for this - numStrings could be large
-            float widthArray[numStrings];
-            int32 lengthArray[numStrings];
-            char *stringArray[numStrings];
+            BStackOrHeapArray<float, 64> widthArray(numStrings);
+            BStackOrHeapArray<int32, 64> lengthArray(numStrings);
+            BStackOrHeapArray<char*, 64> stringArray(numStrings);
             for (int32 i = 0; i < numStrings; i++) {
                 // This version of ReadString allocates the strings, we free
                 // them below
@@ -1882 +1882 @@
                 }
 
                 fLink.StartMessage(B_OK);
-                fLink.Attach(widthArray, sizeof(widthArray));
+                fLink.Attach(widthArray, numStrings * sizeof(float));
             } else
                 fLink.StartMessage(B_BAD_VALUE);
 
@@ -2497 +2497 @@
                 link.Read<escapement_delta>(&deltaArray[i]);
             }
 
-            // TODO: don't do this on the heap! (at least check the size before)
-            BRect rectArray[numStrings];
+            BStackOrHeapArray<BRect, 64> rectArray(numStrings);
 
             ServerFont font;
             bool success = false;
@@ -2513 +2512 @@
                 if (font.GetBoundingBoxesForStrings(stringArray, lengthArray,
                     numStrings, rectArray, mode, deltaArray) == B_OK) {
                     fLink.StartMessage(B_OK);
-                    fLink.Attach(rectArray, sizeof(rectArray));
+                    fLink.Attach(rectArray, numStrings * sizeof(BRect));
                     success = true;
                 }
             }

src/servers/app/drawing/DrawingEngine.cpp

@@ -10 +10 @@
 #include "DrawingEngine.h"
 
 #include <Bitmap.h>
+#include <StackOrHeapArray.h>
+
 #include <stdio.h>
+
 #include <algorithm>
 #include <stack>
 
@@ -469 +472 @@
 
     // TODO: make this step unnecessary
     // (by using different stack impl inside node)
-    node nodes[count];
+    BStackOrHeapArray<node, 64> nodes(count);
     for (int32 i= 0; i < count; i++) {
         nodes[i].init(region->RectAt(i), count);
     }