Quellcode durchsuchen

[settings] Handle errors in fetchf_uristring()

fetchf_uristring() was failing to handle error values from
fetch_setting(), resulting in its attempting to allocate extremely
large temporary buffers on the stack (and so overrunning the stack and
locking up the machine).

Problem reported by Shao Miller <Shao.Miller@yrdsb.edu.on.ca>.
tags/v0.9.7
Michael Brown vor 15 Jahren
Ursprung
Commit
4e6b62c946
1 geänderte Dateien mit 4 neuen und 1 gelöschten Zeilen
  1. 4
    1
      src/core/settings.c

+ 4
- 1
src/core/settings.c Datei anzeigen

@@ -825,12 +825,15 @@ static int storef_uristring ( struct settings *settings,
825 825
 static int fetchf_uristring ( struct settings *settings,
826 826
 			      struct setting *setting,
827 827
 			      char *buf, size_t len ) {
828
-	size_t raw_len;
828
+	ssize_t raw_len;
829 829
 
830 830
 	/* We need to always retrieve the full raw string to know the
831 831
 	 * length of the encoded string.
832 832
 	 */
833 833
 	raw_len = fetch_setting ( settings, setting, NULL, 0 );
834
+	if ( raw_len < 0 )
835
+		return raw_len;
836
+
834 837
 	{
835 838
 		char raw_buf[ raw_len + 1 ];
836 839
        

Laden…
Abbrechen
Speichern