Skip to content

Commit d6dff21

Browse files
committed
Merged revision(s) 3075 from SourceForge:
Correção de AV em SocketDriver Indy.
1 parent fd51345 commit d6dff21

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

CORE/Source/Consts/uRESTDWConsts.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
monthnames : Array [1 .. 12] Of string = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', {do not localize}
7272
'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'); {do not localize}
7373
RESTDWVersionINFO = 'v2.0.2-';
74-
RESTDWRelease = '3072';
74+
RESTDWRelease = '3075';
7575
RESTDWCodeProject = 'Savage Reign - GitHub';
7676
RESTDWVersao = RESTDWVersionINFO + RESTDWRelease + '(' + RESTDWCodeProject + ')';
7777
GOffsetFromUTC : TDateTime = 0{$IFDEF HAS_DEPRECATED}deprecated{$ENDIF};

CORE/Source/Sockets/Indy/uRESTDWIdBase.pas

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3123,26 +3123,29 @@ TIdHTTPAccess = class(TIdHTTP)
31233123
{$IFEND}
31243124
{$ENDIF}
31253125
AResponseInfo.ResponseNo := StatusCode;
3126-
If (vResponseString <> '') Or
3127-
(ErrorMessage <> '') Then
3126+
If (vResponseString <> '') Or
3127+
(ErrorMessage <> '') Then
31283128
Begin
3129-
If Assigned(ResultStream) Then
3129+
If Assigned(ResultStream) Then
31303130
FreeAndNil(ResultStream);
31313131
If (vResponseString <> '') Then
31323132
ResultStream := TStringStream.Create(vResponseString)
31333133
Else
31343134
ResultStream := TStringStream.Create(ErrorMessage);
31353135
End;
3136-
if Assigned(ResultStream) then //anderson
3137-
begin
3136+
If Assigned(ResultStream) Then
3137+
Begin
31383138
AResponseInfo.FreeContentStream := True;
31393139
AResponseInfo.ContentStream := ResultStream;
31403140
AResponseInfo.ContentStream.Position := 0;
3141-
end;
3141+
End;
31423142
{$IFNDEF FPC}
3143-
AResponseInfo.ContentLength := ResultStream.Size;
3143+
if Assigned(ResultStream) Then
3144+
AResponseInfo.ContentLength := ResultStream.Size
3145+
Else
3146+
AResponseInfo.ContentLength := -1;
31443147
{$ELSE}
3145-
AResponseInfo.ContentLength := -1;
3148+
AResponseInfo.ContentLength := -1;
31463149
{$ENDIF}
31473150
For I := 0 To vResponseHeader.Count -1 Do
31483151
AResponseInfo.CustomHeaders.AddValue(vResponseHeader.Names [I],

0 commit comments

Comments
 (0)