kc3-lang/angle/src/gpu_info_util/SystemInfo_x11.cpp

• Show log

  Commit

• Hash : 6344d8ea
  Author :
  Date : 2019-01-02T13:23:21
  

  Fix a crash on checking NVIDIA driver version with incorrect X11 DISPLAY
  
  Check if the display was valid (non-null Display pointer) before
  querying NVCTRL X11 extension.
  
  Bug: 840249
  Change-Id: I299f87e2eb150d56649dd71c7becbe8f8abf7841
  Reviewed-on: https://chromium-review.googlesource.com/c/1392906
  Reviewed-by: Geoff Lang <geofflang@chromium.org>
  Reviewed-by: Corentin Wallez <cwallez@chromium.org>
  Commit-Queue: Geoff Lang <geofflang@chromium.org>
  

Download

• src/gpu_info_util/SystemInfo_x11.cpp

• //
  // Copyright (c) 2013-2017 The ANGLE Project Authors. All rights reserved.
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
  //
  
  // SystemInfo_x11.cpp: implementation of the X11-specific parts of SystemInfo.h
  
  #include "gpu_info_util/SystemInfo_internal.h"
  
  #include <X11/Xlib.h>
  
  #include "common/debug.h"
  #include "third_party/libXNVCtrl/NVCtrl.h"
  #include "third_party/libXNVCtrl/NVCtrlLib.h"
  
  #if !defined(GPU_INFO_USE_X11)
  #    error SystemInfo_x11.cpp compiled without GPU_INFO_USE_X11
  #endif
  
  namespace angle
  {
  
  bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version)
  {
      *version = "";
  
      int eventBase = 0;
      int errorBase = 0;
  
      Display *display = XOpenDisplay(nullptr);
  
      if (display && XNVCTRLQueryExtension(display, &eventBase, &errorBase))
      {
          int screenCount = ScreenCount(display);
          for (int screen = 0; screen < screenCount; ++screen)
          {
              char *buffer = nullptr;
              if (XNVCTRLIsNvScreen(display, screen) &&
                  XNVCTRLQueryStringAttribute(display, screen, 0,
                                              NV_CTRL_STRING_NVIDIA_DRIVER_VERSION, &buffer))
              {
                  ASSERT(buffer != nullptr);
                  *version = buffer;
                  XFree(buffer);
                  return true;
              }
          }
      }
  
      return false;
  }
  }  // namespace angle
  

Download