forked from pool/python312
Matěj Cepl
ffa140fab3
Fix readline history truncation when length is reduced The `readline.set_history_length()` function did not previously truncate the in-memory history when the new length was set to a value smaller than the current number of history items. This could lead to unexpected behavior where `get_history_length()` would still report the old length and writing the history to a file would write more entries than the new limit. This patch modifies `set_history_length()` to explicitly remove the oldest history entries using `remove_history()` when the length is decreased, ensuring the in-memory history is correctly truncated to the new limit. This brings the function's behavior in line with expectations and fixes failures in `test_write_read_limited_history`.
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
Index: Python-3.12.12/Modules/readline.c
|
|
===================================================================
|
|
--- Python-3.12.12.orig/Modules/readline.c 2025-11-19 20:17:29.982940492 +0100
|
|
+++ Python-3.12.12/Modules/readline.c 2025-11-19 20:36:46.627307300 +0100
|
|
@@ -145,6 +145,8 @@
|
|
|
|
#define readlinestate_global ((readlinestate *)PyModule_GetState(PyState_FindModule(&readlinemodule)))
|
|
|
|
+static int _py_get_history_length(void);
|
|
+static void _py_free_history_entry(HIST_ENTRY *entry);
|
|
|
|
/* Convert to/from multibyte C strings */
|
|
|
|
@@ -384,6 +386,27 @@
|
|
/*[clinic end generated code: output=e161a53e45987dc7 input=b8901bf16488b760]*/
|
|
{
|
|
_history_length = length;
|
|
+
|
|
+ if (length < 0) {
|
|
+ stifle_history(-1);
|
|
+ }
|
|
+ else {
|
|
+ int current_length = _py_get_history_length();
|
|
+ if (length < current_length) {
|
|
+#if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION >= 0x0500
|
|
+ HISTORY_STATE *state = history_get_history_state();
|
|
+ if (state) {
|
|
+ int i;
|
|
+ for (i = 0; i < current_length - length; i++) {
|
|
+ _py_free_history_entry(remove_history(0));
|
|
+ }
|
|
+ state->length = length;
|
|
+ free(state);
|
|
+ }
|
|
+#endif
|
|
+ }
|
|
+ stifle_history(length);
|
|
+ }
|
|
Py_RETURN_NONE;
|
|
}
|
|
|