dwindows: gtk3/dw.c comparison

GTK: Update ancient unsafe code in dw_environment_query() on Unix.

comparison

equal deleted inserted replaced

-:1a93c508bb51
+:f7c462f27829
 *       env: Pointer to a DWEnv struct.
 */
 void dw_environment_query(DWEnv *env)
 {
 struct utsname name;
-char tempbuf[100];
+char tempbuf[100] = { 0 }, *dot;
-int len, z;
 uname(&name);
-strcpy(env->osName, name.sysname);
+memset(env, '\0', sizeof(DWEnv));
-strcpy(tempbuf, name.release);
+strncpy(env->osName, name.sysname, sizeof(env->osName)-1);
+strncpy(tempbuf, name.release, 99);
-env->MajorBuild = env->MinorBuild = 0;
+strncpy(env->buildDate, __DATE__, sizeof(env->buildDate)-1);
-len = strlen(tempbuf);
+strncpy(env->buildTime, __TIME__, sizeof(env->buildTime)-1);
-strcpy(env->buildDate, __DATE__);
-strcpy(env->buildTime, __TIME__);
 env->DWMajorVersion = DW_MAJOR_VERSION;
 env->DWMinorVersion = DW_MINOR_VERSION;
 #ifdef VER_REV
 env->DWSubVersion = VER_REV;
 #else
 env->DWSubVersion = DW_SUB_VERSION;
 #endif
-for(z=1;z<len;z++)
+if((dot = strchr(tempbuf, '.')) != NULL)
 {
-if(tempbuf[z] == '.')
+*dot = '\0';
-{
+env->MajorVersion = atoi(tempbuf);
-tempbuf[z] = '\0';
+env->MinorVersion = atoi(&dot[1]);
-env->MajorVersion = atoi(&tempbuf[z-1]);
+return;
-env->MinorVersion = atoi(&tempbuf[z+1]);
-return;
-}
 }
 env->MajorVersion = atoi(tempbuf);
-env->MinorVersion = 0;
 }
 /*
 * Opens a file dialog and queries user selection.
 * Parameters:

Mercurial > dwindows