drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-19 01:13:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix memory leak in the logn builtin function

Browse Source
This commit is contained in:
Landon Curt Noll
2023-10-06 23:27:42 -07:00
parent 01f0605055
commit 0b57d6b605
2 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -11,6 +11,8 @@ The following are the changes from calc version 2.15.0.2 to date:
macOS 14.0 that, when uncommented and calc is recompiled (i.e., macOS 14.0 that, when uncommented and calc is recompiled (i.e.,
make clobber all) will enable the Address Sanitizer (ASAN) for calc. make clobber all) will enable the Address Sanitizer (ASAN) for calc.
Fixed a memory leak in the logn builtin function.
The following are the changes from calc version 2.14.3.5 to 2.15.0.1: The following are the changes from calc version 2.14.3.5 to 2.15.0.1:

54
func.c
View File

@@ -2479,6 +2479,7 @@ f_logn(int count, VALUE **vals)
ln_of_x_is_complex = true; ln_of_x_is_complex = true;
} }
} else { } else {
ln_x_c = NULL; /* avoid ln_x_c may be uninitialized warning later on */
ln_x_r = qln(vals[0]->v_num, err); ln_x_r = qln(vals[0]->v_num, err);
if (ln_x_r == NULL) { if (ln_x_r == NULL) {
return error_value(E_LOGN_3); return error_value(E_LOGN_3);
@@ -2512,6 +2513,11 @@ f_logn(int count, VALUE **vals)
switch (vals[1]->v_type) { switch (vals[1]->v_type) {
case V_NUM: case V_NUM:
if (qiszero(vals[1]->v_num)) { if (qiszero(vals[1]->v_num)) {
if (ln_of_x_is_complex == true) {
comfree(ln_x_c);
} else {
qfree(ln_x_r);
}
return error_value(E_LOGN_4); return error_value(E_LOGN_4);
} }
if (qisneg(vals[1]->v_num)) { if (qisneg(vals[1]->v_num)) {
@@ -2520,10 +2526,20 @@ f_logn(int count, VALUE **vals)
ctmp.links = 1; ctmp.links = 1;
ln_n_c = c_ln(&ctmp, err); ln_n_c = c_ln(&ctmp, err);
if (ln_n_c == NULL) { if (ln_n_c == NULL) {
if (ln_of_x_is_complex == true) {
comfree(ln_x_c);
} else {
qfree(ln_x_r);
}
return error_value(E_LOGN_4); return error_value(E_LOGN_4);
} }
if (ciszero(ln_n_c)) { if (ciszero(ln_n_c)) {
comfree(ln_n_c); comfree(ln_n_c);
if (ln_of_x_is_complex == true) {
comfree(ln_x_c);
} else {
qfree(ln_x_r);
}
return error_value(E_LOGN_4); return error_value(E_LOGN_4);
} }
if (cisreal(ln_n_c)) { if (cisreal(ln_n_c)) {
@@ -2534,24 +2550,49 @@ f_logn(int count, VALUE **vals)
} else { } else {
ln_n_r = qln(vals[1]->v_num, err); ln_n_r = qln(vals[1]->v_num, err);
if (ln_n_r == NULL) { if (ln_n_r == NULL) {
if (ln_of_x_is_complex == true) {
comfree(ln_x_c);
} else {
qfree(ln_x_r);
}
return error_value(E_LOGN_4); return error_value(E_LOGN_4);
} }
if (qiszero(ln_n_r)) { if (qiszero(ln_n_r)) {
qfree(ln_n_r); qfree(ln_n_r);
if (ln_of_x_is_complex == true) {
comfree(ln_x_c);
} else {
qfree(ln_x_r);
}
return error_value(E_LOGN_4); return error_value(E_LOGN_4);
} }
} }
break; break;
case V_COM: case V_COM:
if (ciszero(vals[1]->v_com)) { if (ciszero(vals[1]->v_com)) {
if (ln_of_x_is_complex == true) {
comfree(ln_x_c);
} else {
qfree(ln_x_r);
}
return error_value(E_LOGN_4); return error_value(E_LOGN_4);
} }
ln_n_c = c_ln(vals[1]->v_com, err); ln_n_c = c_ln(vals[1]->v_com, err);
if (ln_n_c == NULL) { if (ln_n_c == NULL) {
if (ln_of_x_is_complex == true) {
comfree(ln_x_c);
} else {
qfree(ln_x_r);
}
return error_value(E_LOGN_4); return error_value(E_LOGN_4);
} }
if (ciszero(ln_n_c)) { if (ciszero(ln_n_c)) {
comfree(ln_n_c); comfree(ln_n_c);
if (ln_of_x_is_complex == true) {
comfree(ln_x_c);
} else {
qfree(ln_x_r);
}
return error_value(E_LOGN_4); return error_value(E_LOGN_4);
} }
if (cisreal(ln_n_c)) { if (cisreal(ln_n_c)) {
@@ -2561,6 +2602,11 @@ f_logn(int count, VALUE **vals)
} }
break; break;
default: default:
if (ln_of_x_is_complex == true) {
comfree(ln_x_c);
} else {
qfree(ln_x_r);
}
return error_value(E_LOGN_5); return error_value(E_LOGN_5);
} }
@@ -2574,6 +2620,8 @@ f_logn(int count, VALUE **vals)
* case: ln(x) is COMPLEX, ln(n) is COMPLEX * case: ln(x) is COMPLEX, ln(n) is COMPLEX
*/ */
p_cval = c_div(ln_x_c, ln_n_c); p_cval = c_div(ln_x_c, ln_n_c);
comfree(ln_x_c);
comfree(ln_n_c);
if (p_cval == NULL) { if (p_cval == NULL) {
return error_value(E_LOGN_3); return error_value(E_LOGN_3);
} }
@@ -2594,6 +2642,8 @@ f_logn(int count, VALUE **vals)
* case: ln(x) is COMPLEX, ln(n) is NUMBER * case: ln(x) is COMPLEX, ln(n) is NUMBER
*/ */
p_cval = c_divq(ln_x_c, ln_n_r); p_cval = c_divq(ln_x_c, ln_n_r);
comfree(ln_x_c);
qfree(ln_n_r);
if (p_cval == NULL) { if (p_cval == NULL) {
return error_value(E_LOGN_3); return error_value(E_LOGN_3);
} }
@@ -2620,6 +2670,8 @@ f_logn(int count, VALUE **vals)
ctmp.imag = qlink(&_qzero_); ctmp.imag = qlink(&_qzero_);
ctmp.links = 1; ctmp.links = 1;
p_cval = c_div(&ctmp, ln_n_c); p_cval = c_div(&ctmp, ln_n_c);
comfree(&ctmp);
comfree(ln_n_c);
if (p_cval == NULL) { if (p_cval == NULL) {
return error_value(E_LOGN_3); return error_value(E_LOGN_3);
} }
@@ -2640,6 +2692,8 @@ f_logn(int count, VALUE **vals)
* case: ln(x) is NUMBER, ln(n) is NUMBER * case: ln(x) is NUMBER, ln(n) is NUMBER
*/ */
result.v_num = qqdiv(ln_x_r, ln_n_r); result.v_num = qqdiv(ln_x_r, ln_n_r);
qfree(ln_x_r);
qfree(ln_n_r);
if (result.v_com == NULL) { if (result.v_com == NULL) {
return error_value(E_LOGN_3); return error_value(E_LOGN_3);
} }