mirror of
https://github.com/curl/curl.git
synced 2026-05-30 02:27:29 +03: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
116 lines
3.3 KiB
C
116 lines
3.3 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 "curlcheck.h"
|
|
#include "bufref.h"
|
|
#include "memdebug.h"
|
|
|
|
static struct bufref bufref;
|
|
|
|
static int freecount = 0;
|
|
|
|
static void test_free(void *p)
|
|
{
|
|
fail_unless(p, "pointer to free may not be NULL");
|
|
freecount++;
|
|
free(p);
|
|
}
|
|
|
|
static CURLcode unit_setup(void)
|
|
{
|
|
Curl_bufref_init(&bufref);
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static void unit_stop(void)
|
|
{
|
|
Curl_bufref_free(&bufref);
|
|
}
|
|
|
|
UNITTEST_START
|
|
{
|
|
const char *buffer = NULL;
|
|
CURLcode result = CURLE_OK;
|
|
|
|
/**
|
|
* testing Curl_bufref_init.
|
|
* @assumptions:
|
|
* 1: data size will be 0
|
|
* 2: reference will be NULL
|
|
* 3: destructor will be NULL
|
|
*/
|
|
|
|
fail_unless(!bufref.ptr, "Initial reference must be NULL");
|
|
fail_unless(!bufref.len, "Initial length must be NULL");
|
|
fail_unless(!bufref.dtor, "Destructor must be NULL");
|
|
|
|
/**
|
|
* testing Curl_bufref_set
|
|
*/
|
|
|
|
buffer = malloc(13);
|
|
abort_unless(buffer, "Out of memory");
|
|
Curl_bufref_set(&bufref, buffer, 13, test_free);
|
|
|
|
fail_unless((const char *)bufref.ptr == buffer, "Referenced data badly set");
|
|
fail_unless(bufref.len == 13, "Data size badly set");
|
|
fail_unless(bufref.dtor == test_free, "Destructor badly set");
|
|
|
|
/**
|
|
* testing Curl_bufref_ptr
|
|
*/
|
|
|
|
fail_unless((const char *) Curl_bufref_ptr(&bufref) == buffer,
|
|
"Wrong pointer value returned");
|
|
|
|
/**
|
|
* testing Curl_bufref_len
|
|
*/
|
|
|
|
fail_unless(Curl_bufref_len(&bufref) == 13, "Wrong data size returned");
|
|
|
|
/**
|
|
* testing Curl_bufref_memdup
|
|
*/
|
|
|
|
result = Curl_bufref_memdup(&bufref, "1661", 3);
|
|
abort_unless(result == CURLE_OK, curl_easy_strerror(result));
|
|
fail_unless(freecount == 1, "Destructor not called");
|
|
fail_unless((const char *)bufref.ptr != buffer, "Returned pointer not set");
|
|
buffer = (const char *)Curl_bufref_ptr(&bufref);
|
|
fail_unless(buffer, "Allocated pointer is NULL");
|
|
fail_unless(bufref.len == 3, "Wrong data size stored");
|
|
fail_unless(!buffer[3], "Duplicated data should have been truncated");
|
|
fail_unless(!strcmp(buffer, "166"), "Bad duplicated data");
|
|
|
|
/**
|
|
* testing Curl_bufref_free
|
|
*/
|
|
|
|
Curl_bufref_free(&bufref);
|
|
fail_unless(freecount == 1, "Wrong destructor called");
|
|
fail_unless(!bufref.ptr, "Initial reference must be NULL");
|
|
fail_unless(!bufref.len, "Initial length must be NULL");
|
|
fail_unless(!bufref.dtor, "Destructor must be NULL");
|
|
}
|
|
UNITTEST_STOP
|