Просмотр исходного кода

Update sources with strcpy occurrences

Daniele Bartolini 12 лет назад
Родитель
Сommit
1327d2b8bd
3 измененных файлов с 5 добавлено и 5 удалено
  1. 1 1
      src/Device.cpp
  2. 2 2
      src/JSONParser.cpp
  3. 2 2
      src/os/win/OsWindow.cpp

+ 1 - 1
src/Device.cpp

@@ -461,7 +461,7 @@ void Device::parse_command_line(int argc, char** argv)
 			// Root path
 			case 'r':
 			{
-				string::strcpy(m_preferred_root_path, args.optarg());
+				string::strncpy(m_preferred_root_path, args.optarg(), MAX_PATH_LENGTH);
 				break;
 			}
 			// Window width

+ 2 - 2
src/JSONParser.cpp

@@ -351,7 +351,7 @@ void JSONParser::fill_token(JSONToken* token, JSONType type, int32_t start, int3
 	m_file->seek(token->m_start);
 	m_file->read(tmp, token->m_size);
 	tmp[token->m_size] = '\0';
-	string::strcpy(token->m_value, tmp);
+	string::strncpy(token->m_value, tmp, 1024);
 
 	m_file->seek(cur_pos);
 }
@@ -585,7 +585,7 @@ JSONParser& JSONParser::get_bool(const char* key)
 //--------------------------------------------------------------------------
 void JSONParser::to_string(char* value)
 {
-	string::strcpy(value, m_tokens[m_nodes[m_nodes_count-1].m_id].m_value);
+	string::strncpy(value, m_tokens[m_nodes[m_nodes_count-1].m_id].m_value, JSONToken::MAX_TOKEN_LEN);
 
 	reset_nodes();
 }

+ 2 - 2
src/os/win/OsWindow.cpp

@@ -99,7 +99,7 @@ OsWindow::OsWindow(uint32_t width, uint32_t height) :
 {
 	CE_ASSERT(width != 0 || height != 0, "Width and height must differ from 0.");
 
-	string::strcpy(m_window_name, "CrownWindowClass");
+	string::strncpy(m_window_name, "CrownWindowClass", 32);
 	WNDCLASSEX wcex;
 	wcex.cbSize = sizeof(WNDCLASSEX);
 	wcex.style = CS_OWNDC;
@@ -278,7 +278,7 @@ char* OsWindow::title()
 //-----------------------------------------------------------------------------
 void OsWindow::set_title(const char* title)
 {
-	string::strcpy(m_window_name, title);
+	string::strncpy(m_window_name, title, 32);
 	SetWindowText(m_window_handle, m_window_name);
 }