Commit: f08f0d109f3cbaad54a3dbe76e5d6b4b952dfa8c - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: f08f0d109f3cbaad54a3dbe76e5d6b4b952dfa8c (tree)
• Zeit: 2009-11-23 22:12:49
• Autor: h677 <h677>
• Commiter: h677

Log Message

refs #19657
生キー指定の際に、16進コードのアルファベット部分を変換できない不具合の修正

Ändern Zusammenfassung

• modified: Trip.pas

Diff

--- a/Trip.pas
+++ b/Trip.pas
@@ -435,7 +435,7 @@ begin
             if (Pos(pw[2*i + 0 + 1], '0123456789abcdefABCDEF') > 0) and
                 (Pos(pw[2*i + 1 + 1], '0123456789abcdefABCDEF') > 0) then begin
                 convpw := convpw +
-                    Char(StrToInt( pw[2*i + 0 + 1] ) shl 4 + StrToInt( pw[2*i + 1 + 1] ));
+                    Char(StrToInt( 'x' + pw[2*i + 0 + 1] ) shl 4 + StrToInt( 'x'  + pw[2*i + 1 + 1] ));
             end else begin
                 convpw := '';
                 Break;
@@ -498,7 +498,10 @@ begin
             if pw[ 0 ] = '#' then begin
                 get_pw_salt(pw, convpw, salt);
             end;
-            if Length(convpw) = 8 then begin
+            if (pw[ 0 ] = '#') and (Length(pw) >= 12) then begin
+                // «—ˆ‚ÌŠg’£—p
+                Result := '???';
+            end else if Length(convpw) = 8 then begin
                 Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
             end else begin
                 // V•ûŽ®