InnoDB: Tolerate negative return values from ftell(). (a12d52a1) · Commits · Software / OSDI20 Artifacts / mariadb

sql/ha_innodb.cc

+9 −9

Original line number	Diff line number	Diff line
		@@ -4346,12 +4346,12 @@ ha_innobase::update_table_comment(
		(ulong) innobase_get_free_space());
		dict_print_info_on_foreign_keys(FALSE, file, prebuilt->table);
		flen = ftell(file);
		if(length + flen + 3 > 64000) {
		if (flen < 0) {
		flen = 0;
		} else if (length + flen + 3 > 64000) {
		flen = 64000 - 3 - length;
		}

		ut_ad(flen > 0);

		/* allocate buffer for the full string, and
		read the contents of the temporary file */

		@@ -4414,12 +4414,12 @@ ha_innobase::get_foreign_key_create_info(void)
		prebuilt->trx->op_info = (char*)"";

		flen = ftell(file);
		if(flen > 64000 - 1) {
		if (flen < 0) {
		flen = 0;
		} else if(flen > 64000 - 1) {
		flen = 64000 - 1;
		}

		ut_ad(flen >= 0);

		/* allocate buffer for the string, and
		read the contents of the temporary file */

		@@ -4800,12 +4800,12 @@ innodb_show_status(
		srv_printf_innodb_monitor(srv_monitor_file);
		flen = ftell(srv_monitor_file);
		os_file_set_eof(srv_monitor_file);
		if(flen > 64000 - 1) {
		if (flen < 0) {
		flen = 0;
		} else if (flen > 64000 - 1) {
		flen = 64000 - 1;
		}

		ut_ad(flen > 0);

		/* allocate buffer for the string, and
		read the contents of the temporary file */