diff options
| author | drh <> | 2023-04-28 10:23:01 +0000 |
|---|---|---|
| committer | drh <> | 2023-04-28 10:23:01 +0000 |
| commit | ea2529528ef9f195bbf03c980eb254581aae2bcd (patch) | |
| tree | 3d72d53548fc587cbb7b42991b03fa80e6cfc3b6 /src/os_win.c | |
| parent | 52da6d26074a6aa3e3aed0e16b18a91b068490ca (diff) | |
| parent | 90f549a0cfb94c25e2126e27ce358618e11e8bd6 (diff) | |
| download | sqlite-ea2529528ef9f195bbf03c980eb254581aae2bcd.tar.gz sqlite-ea2529528ef9f195bbf03c980eb254581aae2bcd.zip | |
Merge all the latest trunk fixes and enhancements into the json5 branch.
FossilOrigin-Name: b5ca15cfc19380cf870b70be6a86e70f2026cc3d6d89005b45891d58c4f11c2d
Diffstat (limited to 'src/os_win.c')
| -rw-r--r-- | src/os_win.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/os_win.c b/src/os_win.c index abecf1b93..b7b689745 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -5197,7 +5197,7 @@ static int winOpen( if( isReadWrite ){ int rc2, isRO = 0; sqlite3BeginBenignMalloc(); - rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO); + rc2 = winAccess(pVfs, zUtf8Name, SQLITE_ACCESS_READ, &isRO); sqlite3EndBenignMalloc(); if( rc2==SQLITE_OK && isRO ) break; } @@ -5214,7 +5214,7 @@ static int winOpen( if( isReadWrite ){ int rc2, isRO = 0; sqlite3BeginBenignMalloc(); - rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO); + rc2 = winAccess(pVfs, zUtf8Name, SQLITE_ACCESS_READ, &isRO); sqlite3EndBenignMalloc(); if( rc2==SQLITE_OK && isRO ) break; } @@ -5234,7 +5234,7 @@ static int winOpen( if( isReadWrite ){ int rc2, isRO = 0; sqlite3BeginBenignMalloc(); - rc2 = winAccess(pVfs, zName, SQLITE_ACCESS_READ, &isRO); + rc2 = winAccess(pVfs, zUtf8Name, SQLITE_ACCESS_READ, &isRO); sqlite3EndBenignMalloc(); if( rc2==SQLITE_OK && isRO ) break; } @@ -5457,6 +5457,13 @@ static int winAccess( OSTRACE(("ACCESS name=%s, flags=%x, pResOut=%p\n", zFilename, flags, pResOut)); + if( zFilename==0 ){ + *pResOut = 0; + OSTRACE(("ACCESS name=%s, pResOut=%p, *pResOut=%d, rc=SQLITE_OK\n", + zFilename, pResOut, *pResOut)); + return SQLITE_OK; + } + zConverted = winConvertFromUtf8Filename(zFilename); if( zConverted==0 ){ OSTRACE(("ACCESS name=%s, rc=SQLITE_IOERR_NOMEM\n", zFilename)); |