Merge branch 'bugfix/fix_whip_base64_size_error' into 'main'

TempoTian · TempoTian · commit 2ac873762bc6 · 2025-05-21T11:52:31.000+08:00
Fix WHIP basic auth base64 encode error

See merge request adf/esp-webrtc-solution!30
diff --git a/components/esp_webrtc/impl/whip_signal/whip_signaling.c b/components/esp_webrtc/impl/whip_signal/whip_signaling.c
@@ -192,7 +192,7 @@ static char *get_auth_header(esp_peer_signaling_whip_cfg_t *whip_cfg)
     size_t token_len = cfg_len;
     int auth_len = (whip_cfg->auth_type == ESP_PEER_SIGNALING_WHIP_AUTH_TYPE_BASIC) ? strlen("Authorization: Basic ") : strlen("Authorization: Bearer ");
     if (whip_cfg->auth_type == ESP_PEER_SIGNALING_WHIP_AUTH_TYPE_BASIC) {
-        token_len = (token_len * 4 / 3) + 2;
+        token_len = ((token_len + 2) / 3) * 4 + 1;
     }
     int len = auth_len + token_len + 1;
     char *auth = malloc(len);

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ static char get_auth_header(esp_peer_signaling_whip_cfg_t whip_cfg)`
`192`	`192`	`size_t token_len = cfg_len;`
`193`	`193`	`int auth_len = (whip_cfg->auth_type == ESP_PEER_SIGNALING_WHIP_AUTH_TYPE_BASIC) ? strlen("Authorization: Basic ") : strlen("Authorization: Bearer ");`
`194`	`194`	`if (whip_cfg->auth_type == ESP_PEER_SIGNALING_WHIP_AUTH_TYPE_BASIC) {`
`195`		`- token_len = (token_len * 4 / 3) + 2;`
	`195`	`+ token_len = ((token_len + 2) / 3) * 4 + 1;`
`196`	`196`	`}`
`197`	`197`	`int len = auth_len + token_len + 1;`
`198`	`198`	`char *auth = malloc(len);`