mirror of
https://github.com/curl/curl.git
synced 2026-04-14 13:01:42 +08:00
f4e23950c7
The issues found fell into these categories, with the applied fixes:
- const was accidentally stripped.
Adjust code to not cast or cast with const.
- const/volatile missing from arguments, local variables.
Constify arguments or variables, adjust/delete casts. Small code
changes in a few places.
- const must be stripped because an API dependency requires it.
Strip `const` with `CURL_UNCONST()` macro to silence the warning out
of our control. These happen at API boundaries. Sometimes they depend
on dependency version, which this patch handles as necessary. Also
enable const support for the zlib API, using `ZLIB_CONST`. Supported
by zlib 1.2.5.2 and newer.
- const must be stripped because a curl API requires it.
Strip `const` with `CURL_UNCONST()` macro to silence the warning out
of our immediate control. For example we promise to send a non-const
argument to a callback, though the data is const internally.
- other cases where we may avoid const stripping by code changes.
Also silenced with `CURL_UNCONST()`.
- there are 3 places where `CURL_UNCONST()` is cast again to const.
To silence this type of warning:
```
lib/vquic/curl_osslq.c:1015:29: error: to be safe all intermediate
pointers in cast from 'unsigned char **' to 'const unsigned char **'
must be 'const' qualified [-Werror=cast-qual]
lib/cf-socket.c:734:32: error: to be safe all intermediate pointers in
cast from 'char **' to 'const char **' must be 'const' qualified
[-Werror=cast-qual]
```
There may be a better solution, but I couldn't find it.
These cases are handled in separate subcommits, but without further
markup.
If you see a `-Wcast-qual` warning in curl, we appreciate your report
about it.
Closes #16142
114 lines
3.2 KiB
C
114 lines
3.2 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#ifdef USE_LIBPSL
|
|
|
|
#include "psl.h"
|
|
#include "share.h"
|
|
|
|
/* The last 3 #include files should be in this order */
|
|
#include "curl_printf.h"
|
|
#include "curl_memory.h"
|
|
#include "memdebug.h"
|
|
|
|
void Curl_psl_destroy(struct PslCache *pslcache)
|
|
{
|
|
if(pslcache->psl) {
|
|
if(pslcache->dynamic)
|
|
psl_free((psl_ctx_t *)CURL_UNCONST(pslcache->psl));
|
|
pslcache->psl = NULL;
|
|
pslcache->dynamic = FALSE;
|
|
}
|
|
}
|
|
|
|
static time_t now_seconds(void)
|
|
{
|
|
struct curltime now = Curl_now();
|
|
|
|
return now.tv_sec;
|
|
}
|
|
|
|
const psl_ctx_t *Curl_psl_use(struct Curl_easy *easy)
|
|
{
|
|
struct PslCache *pslcache = easy->psl;
|
|
const psl_ctx_t *psl;
|
|
time_t now;
|
|
|
|
if(!pslcache)
|
|
return NULL;
|
|
|
|
Curl_share_lock(easy, CURL_LOCK_DATA_PSL, CURL_LOCK_ACCESS_SHARED);
|
|
now = now_seconds();
|
|
if(!pslcache->psl || pslcache->expires <= now) {
|
|
/* Let a chance to other threads to do the job: avoids deadlock. */
|
|
Curl_share_unlock(easy, CURL_LOCK_DATA_PSL);
|
|
|
|
/* Update cache: this needs an exclusive lock. */
|
|
Curl_share_lock(easy, CURL_LOCK_DATA_PSL, CURL_LOCK_ACCESS_SINGLE);
|
|
|
|
/* Recheck in case another thread did the job. */
|
|
now = now_seconds();
|
|
if(!pslcache->psl || pslcache->expires <= now) {
|
|
bool dynamic = FALSE;
|
|
time_t expires = TIME_T_MAX;
|
|
|
|
#if defined(PSL_VERSION_NUMBER) && PSL_VERSION_NUMBER >= 0x001000
|
|
psl = psl_latest(NULL);
|
|
dynamic = psl != NULL;
|
|
/* Take care of possible time computation overflow. */
|
|
expires = now < TIME_T_MAX - PSL_TTL ? now + PSL_TTL : TIME_T_MAX;
|
|
|
|
/* Only get the built-in PSL if we do not already have the "latest". */
|
|
if(!psl && !pslcache->dynamic)
|
|
#endif
|
|
|
|
psl = psl_builtin();
|
|
|
|
if(psl) {
|
|
Curl_psl_destroy(pslcache);
|
|
pslcache->psl = psl;
|
|
pslcache->dynamic = dynamic;
|
|
pslcache->expires = expires;
|
|
}
|
|
}
|
|
Curl_share_unlock(easy, CURL_LOCK_DATA_PSL); /* Release exclusive lock. */
|
|
Curl_share_lock(easy, CURL_LOCK_DATA_PSL, CURL_LOCK_ACCESS_SHARED);
|
|
}
|
|
psl = pslcache->psl;
|
|
if(!psl)
|
|
Curl_share_unlock(easy, CURL_LOCK_DATA_PSL);
|
|
return psl;
|
|
}
|
|
|
|
void Curl_psl_release(struct Curl_easy *easy)
|
|
{
|
|
Curl_share_unlock(easy, CURL_LOCK_DATA_PSL);
|
|
}
|
|
|
|
#endif /* USE_LIBPSL */
|