Changeset 20920 for branches/version-2_11-dev/data/class/SC_MobileImage.php

Timestamp:

2011/05/11 15:24:46 (15 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:20919

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/SC_MobileImage.php 16329@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_MobileImage.php
data/class/pages/mypage/LC_Page_Mypage_DownLoad.php 18777@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_DownLoad.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

3626

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: [email protected]
sha1: 812efec0cdfc81d7f8184a24d5e533c1fbd9079c

bzr:text-parents:

data/class/SC_MobileImage.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_DownLoad.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:20891

bzr:timestamp:

2011-05-11 15:24:42.322999954 +0900

bzr:user-agent:

bzr2.3.1+bzr-svn1.1.0dev0

Message:

#1301 (ダウンロード商品のダウンロードで, 無限ループの可能性)

• fopen() の返り値をチェックするよう修正
• data/class/SC_MobileImage.php でも同様の懸念があったため修正

File:

• branches/version-2_11-dev/data/class/SC_MobileImage.php (modified) (1 diff)

branches/version-2_11-dev/data/class/SC_MobileImage.php

@@ -53 +53 @@
             // 端末の情報を取得する
             $fp = fopen(MOBILE_IMAGE_INC_REALDIR . "mobile_image_map_$carrier.csv", 'r');
+            // 取得できない場合は, 入力内容をそのまま返す
+            if ($fp === false) {
+                return $buffer;
+            }
             while (($data = fgetcsv($fp, 1000, ",")) !== FALSE) {
                 if ($data[1] == $model || $data[1] == '*') {