mirror of
				https://github.com/NVIDIA/cuda-samples.git
				synced 2025-11-04 07:27:49 +08:00 
			
		
		
		
	Fix null pointer refrence issue with cuda driver API function pointers in case cuInit fails
This commit is contained in:
		
							parent
							
								
									8a9e2c830c
								
							
						
					
					
						commit
						fd513b4846
					
				@ -345,17 +345,6 @@ CUresult CUDAAPI cuInit(unsigned int Flags, int cudaVersion)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    CHECKED_CALL(LOAD_LIBRARY(&CudaDrvLib));
 | 
					    CHECKED_CALL(LOAD_LIBRARY(&CudaDrvLib));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // cuInit is required; alias it to _cuInit
 | 
					 | 
				
			||||||
    GET_PROC_EX(cuInit, _cuInit, 1);
 | 
					 | 
				
			||||||
    CHECKED_CALL(_cuInit(Flags));
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    // available since 2.2. if not present, version 1.0 is assumed
 | 
					 | 
				
			||||||
    GET_PROC_OPTIONAL(cuDriverGetVersion);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    if (cuDriverGetVersion) {
 | 
					 | 
				
			||||||
        CHECKED_CALL(cuDriverGetVersion(&driverVer));
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    // fetch all function pointers
 | 
					    // fetch all function pointers
 | 
				
			||||||
    GET_PROC(cuDeviceGet);
 | 
					    GET_PROC(cuDeviceGet);
 | 
				
			||||||
    GET_PROC(cuDeviceGetCount);
 | 
					    GET_PROC(cuDeviceGetCount);
 | 
				
			||||||
@ -620,5 +609,16 @@ CUresult CUDAAPI cuInit(unsigned int Flags, int cudaVersion)
 | 
				
			|||||||
#endif
 | 
					#endif
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // cuInit is required; alias it to _cuInit
 | 
				
			||||||
 | 
					    GET_PROC_EX(cuInit, _cuInit, 1);
 | 
				
			||||||
 | 
					    CHECKED_CALL(_cuInit(Flags));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // available since 2.2. if not present, version 1.0 is assumed
 | 
				
			||||||
 | 
					    GET_PROC_OPTIONAL(cuDriverGetVersion);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (cuDriverGetVersion) {
 | 
				
			||||||
 | 
					        CHECKED_CALL(cuDriverGetVersion(&driverVer));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
    return CUDA_SUCCESS;
 | 
					    return CUDA_SUCCESS;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user