fix: fix memory leaks in ReceiveArray style array parameters

halildurmus · Nov 30, 2023 · 90681e9 · 90681e9
1 parent 0d0d579
commit 90681e9
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 20 deletions.
diff --git a/packages/windows_applicationmodel/lib/src/iappinfo4.dart b/packages/windows_applicationmodel/lib/src/iappinfo4.dart
@@ -42,6 +42,7 @@ class IAppInfo4 extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }

diff --git a/packages/windows_devices/lib/src/display/idisplaymonitor.dart b/packages/windows_devices/lib/src/display/idisplaymonitor.dart
@@ -362,6 +362,7 @@ class IDisplayMonitor extends IInspectable {
       return result.value.toList(length: resultSize.value);
     } finally {
       free(resultSize);
+      free(result.value);
       free(result);
     }
   }

diff --git a/packages/windows_foundation/lib/src/ipropertyvalue.dart b/packages/windows_foundation/lib/src/ipropertyvalue.dart
@@ -370,6 +370,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -388,6 +389,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -406,6 +408,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -424,6 +427,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -442,6 +446,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -460,6 +465,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -478,6 +484,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -496,6 +503,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -514,6 +522,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -532,6 +541,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toStringList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -550,6 +560,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -568,6 +579,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -586,6 +598,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toObjectList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -604,6 +617,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -622,6 +636,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toDateTimeList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -640,6 +655,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toDurationList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -658,6 +674,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -676,6 +693,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }
@@ -694,6 +712,7 @@ class IPropertyValue extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }

diff --git a/packages/windows_foundation/test/internal/extensions/object_test.dart b/packages/windows_foundation/test/internal/extensions/object_test.dart
@@ -172,6 +172,7 @@ void main() {
           return value.value;
         } finally {
           free(valueSize);
+          free(value.value);
           free(value);
         }
       }

diff --git a/packages/windows_graphics/lib/src/imaging/ipixeldataprovider.dart b/packages/windows_graphics/lib/src/imaging/ipixeldataprovider.dart
@@ -43,6 +43,7 @@ class IPixelDataProvider extends IInspectable {
       return pixelData.value.toList(length: pixelDataSize.value);
     } finally {
       free(pixelDataSize);
+      free(pixelData.value);
       free(pixelData);
     }
   }

diff --git a/packages/windows_media/lib/src/devices/idigitalwindowcontrol.dart b/packages/windows_media/lib/src/devices/idigitalwindowcontrol.dart
@@ -63,6 +63,7 @@ class IDigitalWindowControl extends IInspectable {
           .toEnumList(DigitalWindowMode.from, length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }

diff --git a/...ges/windows_media/lib/src/mediaproperties/iaudioencodingpropertieswithformatuserdata.dart b/...ges/windows_media/lib/src/mediaproperties/iaudioencodingpropertieswithformatuserdata.dart
@@ -59,6 +59,7 @@ class IAudioEncodingPropertiesWithFormatUserData extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }

diff --git a/packages/windows_media/lib/src/mediaproperties/itimedmetadataencodingproperties.dart b/packages/windows_media/lib/src/mediaproperties/itimedmetadataencodingproperties.dart
@@ -59,6 +59,7 @@ class ITimedMetadataEncodingProperties extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }

diff --git a/packages/windows_media/lib/src/mediaproperties/ivideoencodingproperties2.dart b/packages/windows_media/lib/src/mediaproperties/ivideoencodingproperties2.dart
@@ -54,6 +54,7 @@ class IVideoEncodingProperties2 extends IInspectable {
       return value.value.toList(length: valueSize.value);
     } finally {
       free(valueSize);
+      free(value.value);
       free(value);
     }
   }

diff --git a/packages/winrtgen/lib/src/projections/types/array.dart b/packages/winrtgen/lib/src/projections/types/array.dart
@@ -182,6 +182,9 @@ base class ReceiveArrayParameterProjection extends ArrayParameterProjection {
       ];
 
   @override
-  List<String> get postambles =>
-      ['free($sizeIdentifier);', 'free($identifier);'];
+  List<String> get postambles => [
+        'free($sizeIdentifier);',
+        'free($identifier.value);',
+        'free($identifier);'
+      ];
 }
diff --git a/packages/winrtgen/test/projections/getter_test.dart b/packages/winrtgen/test/projections/getter_test.dart
@@ -970,8 +970,8 @@ void main() {
           projection.returnStatement,
           equals(
               'return value.value.toEnumList(DigitalWindowMode.from, length: valueSize.value);'));
-      expect(
-          projection.postambles, equals(['free(valueSize);', 'free(value);']));
+      expect(projection.postambles,
+          equals(['free(valueSize);', 'free(value.value);', 'free(value);']));
     });
 
     test('projects List<Guid>', () {
@@ -1007,8 +1007,14 @@ void main() {
           projection.returnStatement,
           equals(
               'return contentKeyIds.value.toList(length: contentKeyIdsSize.value);'));
-      expect(projection.postambles,
-          equals(['free(contentKeyIdsSize);', 'free(contentKeyIds);']));
+      expect(
+        projection.postambles,
+        equals([
+          'free(contentKeyIdsSize);',
+          'free(contentKeyIds.value);',
+          'free(contentKeyIds);'
+        ]),
+      );
     });
 
     test('projects List<int>', () {
@@ -1042,7 +1048,9 @@ void main() {
       expect(projection.returnStatement,
           equals('return value.value.toList(length: valueSize.value);'));
       expect(
-          projection.postambles, equals(['free(valueSize);', 'free(value);']));
+        projection.postambles,
+        equals(['free(valueSize);', 'free(value.value);', 'free(value);']),
+      );
     });
 
     test('projects List<String>', () {
@@ -1076,7 +1084,9 @@ void main() {
       expect(projection.returnStatement,
           equals('return value.value.toList(length: valueSize.value);'));
       expect(
-          projection.postambles, equals(['free(valueSize);', 'free(value);']));
+        projection.postambles,
+        equals(['free(valueSize);', 'free(value.value);', 'free(value);']),
+      );
     });
 
     test('projects List<Vector2>', () {
@@ -1110,7 +1120,9 @@ void main() {
       expect(projection.returnStatement,
           equals('return value.value.toList(length: valueSize.value);'));
       expect(
-          projection.postambles, equals(['free(valueSize);', 'free(value);']));
+        projection.postambles,
+        equals(['free(valueSize);', 'free(value.value);', 'free(value);']),
+      );
     });
 
     test('projects Object', () {

diff --git a/packages/winrtgen/test/projections/method_test.dart b/packages/winrtgen/test/projections/method_test.dart
@@ -1101,8 +1101,11 @@ void main() {
           projection.returnStatement,
           equals(
               'return result.value.toEnumList(AnnotationType.from, length: resultSize.value);'));
-      expect(projection.postambles,
-          orderedEquals(['free(resultSize);', 'free(result);']));
+      expect(
+        projection.postambles,
+        orderedEquals(
+            ['free(resultSize);', 'free(result.value);', 'free(result);']),
+      );
     });
 
     test('projects List<DisplayId>', () {
@@ -1134,8 +1137,11 @@ void main() {
       expect(projection.nullCheck, isEmpty);
       expect(projection.returnStatement,
           equals('return result.value.toList(length: resultSize.value);'));
-      expect(projection.postambles,
-          orderedEquals(['free(resultSize);', 'free(result);']));
+      expect(
+        projection.postambles,
+        orderedEquals(
+            ['free(resultSize);', 'free(result.value);', 'free(result);']),
+      );
     });
 
     test('projects List<int>', () {
@@ -1171,8 +1177,11 @@ void main() {
       expect(projection.nullCheck, isEmpty);
       expect(projection.returnStatement,
           equals('return result.value.toList(length: resultSize.value);'));
-      expect(projection.postambles,
-          orderedEquals(['free(resultSize);', 'free(result);']));
+      expect(
+        projection.postambles,
+        orderedEquals(
+            ['free(resultSize);', 'free(result.value);', 'free(result);']),
+      );
     });
 
     test('projects List<ITextRangeProvider?>', () {
@@ -1207,8 +1216,11 @@ void main() {
           projection.returnStatement,
           equals(
               'return result.value.toList(ITextRangeProvider.fromPtr, length: resultSize.value);'));
-      expect(projection.postambles,
-          orderedEquals(['free(resultSize);', 'free(result);']));
+      expect(
+        projection.postambles,
+        orderedEquals(
+            ['free(resultSize);', 'free(result.value);', 'free(result);']),
+      );
     });
 
     test('projects List<String> (Char16)', () {
@@ -1236,7 +1248,7 @@ void main() {
               'int Function(VTablePointer lpVtbl, Pointer<Uint32> valueSize, Pointer<Pointer<Uint16>> value)'));
       expect(projection.identifiers, equals('lpVtbl, valueSize, value'));
       expect(projection.parametersPostamble,
-          equals(['free(valueSize);', 'free(value);']));
+          equals(['free(valueSize);', 'free(value.value);', 'free(value);']));
       expect(projection.failedCheck, equals(failedCheck()));
       expect(projection.nullCheck, isEmpty);
       expect(projection.returnStatement,

diff --git a/packages/winrtgen/test/projections/parameter_test.dart b/packages/winrtgen/test/projections/parameter_test.dart
@@ -672,8 +672,8 @@ void main() {
             'final valueSize = calloc<Uint32>();',
             'final value = calloc<Pointer<IntPtr>>();'
           ]));
-      expect(
-          projection.postambles, equals(['free(valueSize);', 'free(value);']));
+      expect(projection.postambles,
+          equals(['free(valueSize);', 'free(value.value);', 'free(value);']));
       expect(projection.nullCheck, isEmpty);
       expect(projection.identifier, equals('value'));
       expect(projection.localIdentifier, equals('value'));