morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[c,warnings] fix unterminated string warnings

Browse Source 
initialize variables as array to avoid warnings with gcc >= 15 or clang
This commit is contained in:
Armin Novak
2026-01-08 11:21:20 +01:00
parent a63165939d
commit f8ac8fb7b6
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libfreerdp/common/assistance.c
View File

@@ -814,14 +814,19 @@ char* freerdp_assistance_construct_expert_blob(const char* name, const char* pas
char* freerdp_assistance_generate_pass_stub(WINPR_ATTR_UNUSED DWORD flags)
{
UINT32 nums[14];
char* passStub = NULL;
char set1[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789*_";
char set2[12] = "!@#$&^*()-+=";
char set3[10] = "0123456789";
char set4[26] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
char set5[26] = "abcdefghijklmnopqrstuvwxyz";
passStub = (char*)malloc(15);
UINT32 nums[14] = { 0 };
const char set1[64] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '_' };
const char set2[12] = { '!', '@', '#', '$', '&', '^', '*', '(', ')', '-', '+', '=' };
const char set3[10] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
const char set4[26] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z' };
const char set5[26] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
char* passStub = calloc(15, sizeof(char));
if (!passStub)
return NULL;
@@ -843,16 +848,9 @@ char* freerdp_assistance_generate_pass_stub(WINPR_ATTR_UNUSED DWORD flags)
passStub[2] = set3[nums[2] % sizeof(set3)]; /* character 2 */
passStub[3] = set4[nums[3] % sizeof(set4)]; /* character 3 */
passStub[4] = set5[nums[4] % sizeof(set5)]; /* character 4 */
passStub[5] = set1[nums[5] % sizeof(set1)]; /* character 5 */
passStub[6] = set1[nums[6] % sizeof(set1)]; /* character 6 */
passStub[7] = set1[nums[7] % sizeof(set1)]; /* character 7 */
passStub[8] = set1[nums[8] % sizeof(set1)]; /* character 8 */
passStub[9] = set1[nums[9] % sizeof(set1)]; /* character 9 */
passStub[10] = set1[nums[10] % sizeof(set1)]; /* character 10 */
passStub[11] = set1[nums[11] % sizeof(set1)]; /* character 11 */
passStub[12] = set1[nums[12] % sizeof(set1)]; /* character 12 */
passStub[13] = set1[nums[13] % sizeof(set1)]; /* character 13 */
passStub[14] = '\0';
for (size_t x = 5; x < ARRAYSIZE(nums); x++)
passStub[x] = set1[nums[x] % sizeof(set1)]; /* character 5 - 13 */
return passStub;
}
@@ -1039,7 +1037,7 @@ char* freerdp_assistance_bin_to_hex_string(const void* raw, size_t size)
static int freerdp_assistance_parse_uploadinfo(rdpAssistanceFile* file, char* uploadinfo,
size_t uploadinfosize)
{
const char escalated[9] = "Escalated";
const char escalated[9] = { 'E', 's', 'c', 'a', 'l', 'a', 't', 'e', 'd' };
const size_t esclen = sizeof(escalated);
const char* typestr = NULL;
size_t typelen = 0;

2
libfreerdp/crypto/certificate.c
View File

@@ -182,7 +182,7 @@ struct rdp_certificate
*
*/
static const char rsa_magic[4] = "RSA1";
static const char rsa_magic[4] = { 'R', 'S', 'A', '1' };
static const char* certificate_read_errors[] = { "Certificate tag",
"TBSCertificate",

2
winpr/libwinpr/clipboard/synthetic_file.c
View File

@@ -284,7 +284,7 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l
const char* c;
const WCHAR* w;
} wildcard;
const char buffer[6] = "/\0*\0\0\0";
const char buffer[6] = { '/', '\0', '*', '\0', '\0', '\0' };
wildcard.c = buffer;
const size_t wildcardLen = ARRAYSIZE(buffer) / sizeof(WCHAR);