mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-07 09:10:18 +02:00
* Fixed StrToTime. TimeAMString and/or TimePMString can be empty on some locales and StrToTime crashed in this case.
git-svn-id: trunk@5957 -
This commit is contained in:
parent
c73860bc39
commit
2602ceb7e4
@ -448,10 +448,10 @@ var
|
||||
Inc(Current);
|
||||
val(copy(S, j, 1 + Current - j), result, c);
|
||||
end
|
||||
else if (S[Current] = TimeAMString[1]) or (S[Current] in ['a', 'A']) then begin
|
||||
else if ((TimeAMString<>'') and (S[Current] = TimeAMString[1])) or (S[Current] in ['a', 'A']) then begin
|
||||
Current := 1 + Len;
|
||||
end
|
||||
else if (S[Current] = TimePMString[1]) or (S[Current] in ['p', 'P']) then begin
|
||||
else if ((TimePMString<>'') and (S[Current] = TimePMString[1])) or (S[Current] in ['p', 'P']) then begin
|
||||
Current := 1 + Len;
|
||||
PM := True;
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user