Browse Source

Merge pull request #3707 from martin-frbg/getarch_risc

Fix crash in RISCV autodetection when pmodel is not present in /proc/cpuinfo
tags/v0.3.21
Martin Kroeker GitHub 3 years ago
parent
commit
648a69a67e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      cpuid_riscv64.c

+ 5
- 2
cpuid_riscv64.c View File

@@ -88,18 +88,21 @@ int detect(void){
infile = fopen("/proc/cpuinfo", "r");
while (fgets(buffer, sizeof(buffer), infile)){
if(!strncmp(buffer, "model name", 10)){
strcpy(model_buffer, buffer)
strcpy(model_buffer, buffer);
pmodel = strchr(isa_buffer, ':') + 1;
}

if(!strncmp(buffer, "isa", 3)){
strcpy(isa_buffer, buffer)
strcpy(isa_buffer, buffer);
pisa = strchr(isa_buffer, '4') + 1;
}
}

fclose(infile);

if (!pmodel)
return(CPU_GENERIC);
if (strstr(pmodel, check_c910_str) && strchr(pisa, 'v'))
return CPU_C910V;



Loading…
Cancel
Save