Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed memory leaks in SwagDoc Library #387

Merged
merged 1 commit into from
May 20, 2020
Merged

Fixed memory leaks in SwagDoc Library #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/swagdoc/Source/Swag.Doc.Definition.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ implementation

destructor TSwagDefinition.Destroy;
begin
FreeAndNil(fJsonSchema);
if Assigned(fJsonSchema) then
FreeAndNil(fJsonSchema);
inherited Destroy;
end;

Expand Down
2 changes: 1 addition & 1 deletion lib/swagdoc/Source/Swag.Doc.Path.Operation.RequestParameter.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ function TSwagRequestParameter.GenerateJsonObject: TJSONObject;
if (not fSchema.Name.IsEmpty) then
vJsonObject.AddPair(c_SwagRequestParameterSchema, fSchema.GenerateJsonRefDefinition)
else if Assigned(fSchema.JsonSchema) then
vJsonObject.AddPair(c_SwagRequestParameterSchema, fSchema.JsonSchema as TJSONObject);
vJsonObject.AddPair(c_SwagRequestParameterSchema, fSchema.JsonSchema.Clone as TJSONObject);
end;
if (fTypeParameter <> stpNotDefined) then
vJsonObject.AddPair(c_SwagRequestParameterType, c_SwagTypeParameter[fTypeParameter]);
Expand Down
4 changes: 2 additions & 2 deletions lib/swagdoc/Source/Swag.Doc.Path.Operation.Response.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function TSwagResponse.GenerateJsonObject: TJSONObject;
if (not fSchema.Name.IsEmpty) then
vJsonObject.AddPair(c_SwagResponseSchema, fSchema.GenerateJsonRefDefinition)
else if Assigned(fSchema.JsonSchema) then
vJsonObject.AddPair(c_SwagResponseSchema, fSchema.JsonSchema as TJSONObject);
vJsonObject.AddPair(c_SwagResponseSchema, fSchema.JsonSchema.Clone as TJSONObject);

if (fExamples.Count > 0) then
vJsonObject.AddPair(c_SwagResponseExamples, GenerateExamplesJsonObject);
Expand Down Expand Up @@ -186,7 +186,7 @@ procedure TSwagResponse.Load(pJson: TJSONObject);
end;

if Assigned(pJson.Values[c_SwagResponseSchema]) then
fSchema.JsonSchema := pJson.Values[c_SwagResponseSchema].Clone as TJSONObject
fSchema.JsonSchema := pJson.Values[c_SwagResponseSchema].Clone as TJSONObject;
end;

end.
2 changes: 1 addition & 1 deletion lib/swagdoc/Source/Swag.Doc.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ function TSwagDoc.GenerateDefinitionsJsonObject: TJSONObject;
begin
Result := TJsonObject.Create;
for vIndex := 0 to fDefinitions.Count -1 do
Result.AddPair(fDefinitions.Items[vIndex].Name, fDefinitions.Items[vIndex].JsonSchema);
Result.AddPair(fDefinitions.Items[vIndex].Name, fDefinitions.Items[vIndex].JsonSchema.Clone as TJSONObject);
end;

function TSwagDoc.GenerateParametersJsonObject: TJSONObject;
Expand Down
1 change: 1 addition & 0 deletions samples/swaggerdoc/SwaggerDocApi.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ program SwaggerDocApi;
{$APPTYPE GUI}

uses
// FastMM4,
Vcl.Forms,
Web.WebReq,
IdHTTPWebBrokerBridge,
Expand Down
2 changes: 0 additions & 2 deletions samples/swaggerdoc/SwaggerDocApi.dproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,9 @@
</DelphiCompile>
<DCCReference Include="MainFormU.pas">
<Form>MainForm</Form>
<FormType>dfm</FormType>
</DCCReference>
<DCCReference Include="WebModuleMainU.pas">
<Form>WebModule1</Form>
<FormType>dfm</FormType>
<DesignClass>TWebModule</DesignClass>
</DCCReference>
<DCCReference Include="MyController1U.pas"/>
Expand Down